Merge yet more updates from Andrew Morton: "This is everything else from -mm for this merge window. 90 patches. Subsystems affected by this patch series: mm (cleanups and slub), alpha, procfs, sysctl, misc, core-kernel, bitmap, lib, compat, checkpatch, epoll, isofs, nilfs2, hpfs, exit, fork, kexec, gcov, panic, delayacct, gdb, resource, selftests, async, initramfs, ipc, drivers/char, and spelling" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (90 commits) mm: fix typos in comments mm: fix typos in comments treewide: remove editor modelines and cruft ipc/sem.c: spelling fix fs: fat: fix spelling typo of values kernel/sys.c: fix typo kernel/up.c: fix typo kernel/user_namespace.c: fix typos kernel/umh.c: fix some spelling mistakes include/linux/pgtable.h: few spelling fixes mm/slab.c: fix spelling mistake "disired" -> "desired" scripts/spelling.txt: add "overflw" scripts/spelling.txt: Add "diabled" typo scripts/spelling.txt: add "overlfow" arm: print alloc free paths for address in registers mm/vmalloc: remove vwrite() mm: remove xlate_dev_kmem_ptr() drivers/char: remove /dev/kmem for good mm: fix some typos and code style problems ipc/sem.c: mundane typo fixes ...
Showing the changes to include/uapi/linux (2 of 340 files). Show all
Unified · Split
| @@ -153,14 +153,3 @@ enum { · 152 unmodified lines | |||
| 153 | #define BOND_3AD_STAT_MAX (__BOND_3AD_STAT_MAX - 1) | 153 | #define BOND_3AD_STAT_MAX (__BOND_3AD_STAT_MAX - 1) |
| 154 | 154 | ||
| 155 | #endif /* _LINUX_IF_BONDING_H */ | 155 | #endif /* _LINUX_IF_BONDING_H */ |
| 156 | |||
| 157 | /* | ||
| 158 | * Local variables: | ||
| 159 | * version-control: t | ||
| 160 | * kept-new-versions: 5 | ||
| 161 | * c-indent-level: 8 | ||
| 162 | * c-basic-offset: 8 | ||
| 163 | * tab-width: 8 | ||
| 164 | * End: | ||
| 165 | */ | ||
| 166 | |||
| @@ -178,9 +178,3 @@ · 177 unmodified lines | |||
| 178 | #define NFS4_MAX_BACK_CHANNEL_OPS 2 | 178 | #define NFS4_MAX_BACK_CHANNEL_OPS 2 |
| 179 | 179 | ||
| 180 | #endif /* _UAPI_LINUX_NFS4_H */ | 180 | #endif /* _UAPI_LINUX_NFS4_H */ |
| 181 | |||
| 182 | /* | ||
| 183 | * Local variables: | ||
| 184 | * c-basic-offset: 8 | ||
| 185 | * End: | ||
| 186 | */ | ||