Merge branch 'akpm' (incoming from Andrew)

Merge first patch-bomb from Andrew Morton:
 - Various misc bits
 - kmemleak fixes
 - small befs, codafs, cifs, efs, freexxfs, hfsplus, minixfs, reiserfs things
 - fanotify
 - I appear to have become SuperH maintainer
 - ocfs2 updates
 - direct-io tweaks
 - a bit of the MM queue
 - printk updates
 - MAINTAINERS maintenance
 - some backlight things
 - lib/ updates
 - checkpatch updates
 - the rtc queue
 - nilfs2 updates
 - Small Documentation/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (237 commits)
  Documentation/SubmittingPatches: remove references to patch-scripts
  Documentation/SubmittingPatches: update some dead URLs
  Documentation/filesystems/ntfs.txt: remove changelog reference
  Documentation/kmemleak.txt: updates
  fs/reiserfs/super.c: add __init to init_inodecache
  fs/reiserfs: move prototype declaration to header file
  fs/hfsplus/attributes.c: add __init to hfsplus_create_attr_tree_cache()
  fs/hfsplus/extents.c: fix concurrent acess of alloc_blocks
  fs/hfsplus/extents.c: remove unused variable in hfsplus_get_block
  nilfs2: update project's web site in nilfs2.txt
  nilfs2: update MAINTAINERS file entries fix
  nilfs2: verify metadata sizes read from disk
  nilfs2: add FITRIM ioctl support for nilfs2
  nilfs2: add nilfs_sufile_trim_fs to trim clean segs
  nilfs2: implementation of NILFS_IOCTL_SET_SUINFO ioctl
  nilfs2: add nilfs_sufile_set_suinfo to update segment usage
  nilfs2: add struct nilfs_suinfo_update and flags
  nilfs2: update MAINTAINERS file entries
  fs/coda/inode.c: add __init to init_inodecache()
  BEFS: logging cleanup
  ...

1 files changed, 20 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 62b66acfdb30..8851c6417880 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -273,6 +273,16 @@ config FHANDLE
           get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
           syscalls.
 
+config USELIB
+        bool "uselib syscall"
+        default y
+        help
+          This option enables the uselib syscall, a system call used in the
+          dynamic linker from libc5 and earlier.  glibc does not use this
+          system call.  If you intend to run programs built on libc5 or
+          earlier, you may need to enable this syscall.  Current systems
+          running glibc can safely disable this.
+
 config AUDIT
         bool "Auditing support"
         depends on NET
@@ -1291,6 +1301,16 @@ config UID16
         help
           This enables the legacy 16-bit UID syscall wrappers.
 
+config SYSFS_SYSCALL
+        bool "Sysfs syscall support" if EXPERT
+        default y
+        ---help---
+          sys_sysfs is an obsolete system call no longer supported in libc.
+          Note that disabling this option is more secure but might break
+          compatibility with some systems.
+
+          If unsure say Y here.
+
 config SYSCTL_SYSCALL
         bool "Sysctl syscall support" if EXPERT
         depends on PROC_SYSCTL