Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: - A few y2038 fixes which missed the merge window while dependencies in NFS were being sorted out. - A bunch of fixes. Some minor, some not. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: MAINTAINERS: use tabs for SAFESETID lib/stackdepot.c: fix global out-of-bounds in stack_slabs mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM mm/vmscan.c: don't round up scan size for online memory cgroup lib/string.c: update match_string() doc-strings with correct behavior mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() mm/swapfile.c: fix a comment in sys_swapon() scripts/get_maintainer.pl: deprioritize old Fixes: addresses get_maintainer: remove uses of P: for maintainer name selftests/vm: add missed tests in run_vmtests include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()" y2038: hide timeval/timespec/itimerval/itimerspec types y2038: remove unused time32 interfaces y2038: remove ktime to/from timespec/timeval conversion
No related branches found
No related tags found
Showing
- MAINTAINERS 4 additions, 4 deletionsMAINTAINERS
- include/linux/compat.h 0 additions, 29 deletionsinclude/linux/compat.h
- include/linux/ktime.h 0 additions, 37 deletionsinclude/linux/ktime.h
- include/linux/time32.h 1 addition, 153 deletionsinclude/linux/time32.h
- include/linux/timekeeping32.h 0 additions, 32 deletionsinclude/linux/timekeeping32.h
- include/linux/types.h 0 additions, 5 deletionsinclude/linux/types.h
- include/uapi/asm-generic/posix_types.h 2 additions, 0 deletionsinclude/uapi/asm-generic/posix_types.h
- include/uapi/linux/swab.h 2 additions, 2 deletionsinclude/uapi/linux/swab.h
- include/uapi/linux/time.h 12 additions, 10 deletionsinclude/uapi/linux/time.h
- ipc/sem.c 2 additions, 4 deletionsipc/sem.c
- kernel/compat.c 0 additions, 64 deletionskernel/compat.c
- kernel/time/time.c 0 additions, 43 deletionskernel/time/time.c
- lib/stackdepot.c 6 additions, 2 deletionslib/stackdepot.c
- lib/string.c 16 additions, 0 deletionslib/string.c
- mm/memcontrol.c 3 additions, 1 deletionmm/memcontrol.c
- mm/sparse.c 1 addition, 1 deletionmm/sparse.c
- mm/swapfile.c 1 addition, 1 deletionmm/swapfile.c
- mm/vmscan.c 6 additions, 3 deletionsmm/vmscan.c
- scripts/get_maintainer.pl 4 additions, 28 deletionsscripts/get_maintainer.pl
- tools/testing/selftests/vm/run_vmtests 33 additions, 0 deletionstools/testing/selftests/vm/run_vmtests
Loading
Please register or sign in to comment