diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 09:07:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 09:07:25 -0700 |
| commit | f70d6318320983a8d2fac28cfe8d22dfd5e52a73 (patch) | |
| tree | e3a427a3abeca491007f036b09be84944657f58e /drivers/staging/lustre/lustre | |
| parent | Staging: lustre/lustre/ptlrpc: service.c: Fixed issue with global integer being initialized to 0 (diff) | |
| parent | Linux 4.2-rc6 (diff) | |
| download | linux-dev-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.tar.xz linux-dev-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.zip | |
Merge 4.2-rc6 into staging-next
We want the IIO and staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/debug.c b/drivers/staging/lustre/lustre/obdclass/debug.c index 9c934e6d2ea1..c61add46b426 100644 --- a/drivers/staging/lustre/lustre/obdclass/debug.c +++ b/drivers/staging/lustre/lustre/obdclass/debug.c @@ -40,7 +40,7 @@ #define DEBUG_SUBSYSTEM D_OTHER -#include <linux/unaligned/access_ok.h> +#include <asm/unaligned.h> #include "../include/obd_support.h" #include "../include/lustre_debug.h" |