Merge branch 'akpm' (incoming from Andrew)
Merge a few more patches from Andrew Morton: "A few leftovers" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: fs/ncpfs/dir.c: fix indenting in ncp_lookup() ncpfs/inode.c: fix mismatch printk formats and arguments ncpfs: remove now unused PRINTK macro ncpfs: convert PPRINTK to ncp_vdbg ncpfs: convert DPRINTK/DDPRINTK to ncp_dbg ncpfs: Add pr_fmt and convert printks to pr_<level> arch/x86/mm/kmemcheck/kmemcheck.c: use kstrtoint() instead of sscanf() lib/percpu_counter.c: fix bad percpu counter state during suspend autofs4: check dev ioctl size before allocating mm: vmscan: do not swap anon pages just because free+file is low
Showing
- arch/x86/mm/kmemcheck/kmemcheck.c 7 additions, 1 deletionarch/x86/mm/kmemcheck/kmemcheck.c
- fs/autofs4/dev-ioctl.c 3 additions, 0 deletionsfs/autofs4/dev-ioctl.c
- fs/ncpfs/dir.c 32 additions, 37 deletionsfs/ncpfs/dir.c
- fs/ncpfs/file.c 13 additions, 11 deletionsfs/ncpfs/file.c
- fs/ncpfs/getopt.c 7 additions, 5 deletionsfs/ncpfs/getopt.c
- fs/ncpfs/inode.c 16 additions, 16 deletionsfs/ncpfs/inode.c
- fs/ncpfs/ioctl.c 8 additions, 9 deletionsfs/ncpfs/ioctl.c
- fs/ncpfs/mmap.c 1 addition, 1 deletionfs/ncpfs/mmap.c
- fs/ncpfs/ncp_fs.h 16 additions, 14 deletionsfs/ncpfs/ncp_fs.h
- fs/ncpfs/ncplib_kernel.c 13 additions, 15 deletionsfs/ncpfs/ncplib_kernel.c
- fs/ncpfs/sock.c 25 additions, 24 deletionsfs/ncpfs/sock.c
- fs/ncpfs/symlink.c 1 addition, 1 deletionfs/ncpfs/symlink.c
- lib/percpu_counter.c 1 addition, 1 deletionlib/percpu_counter.c
- mm/vmscan.c 1 addition, 15 deletionsmm/vmscan.c
Loading
Please register or sign in to comment