Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull misc ia64 bits from Tony Luck.

* tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  MAINTAINERS: update SGI & ia64 Altix stuff
  sysctl: Enable IA64 "ignore-unaligned-usertrap" to be used cross-arch

diff --combined MAINTAINERS
index 73b7d50c9407fd53a7877af999b1a87e9edde009,0526e212bed010494f150985ddf5833bde4097e0..a92f485f54568589df0cefbe66664d07e4ce4557
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -228,7 -228,7 +228,7 @@@ S: Maintaine
  F:    drivers/platform/x86/acerhdf.c
  
  ACER WMI LAPTOP EXTRAS
 -M:    Joey Lee <jlee@novell.com>
 +M:    "Lee, Chun-Yi" <jlee@suse.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/acer-wmi.c
@@@ -449,7 -449,6 +449,7 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/char/agp/
  F:    include/linux/agp*
 +F:    include/uapi/linux/agp*
  
  AHA152X SCSI DRIVER
  M:    "Juergen E. Fischer" <[email protected]>
@@@ -590,7 -589,6 +590,7 @@@ M: Jiri Kosina <[email protected]
  S:    Odd fixes
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
 +F:    include/uapi/linux/apm_bios.h
  F:    drivers/char/apm-emulation.c
  
  APPLE BCM5974 MULTITOUCH DRIVER
@@@ -648,7 -646,7 +648,7 @@@ F: arch/arm
  
  ARM SUB-ARCHITECTURES
  L:    [email protected] (moderated for non-subscribers)
 -S:    MAINTAINED
 +S:    Maintained
  F:    arch/arm/mach-*/
  F:    arch/arm/plat-*/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
@@@ -670,16 -668,8 +670,16 @@@ F:       drivers/input/serio/ambakmi.
  F:    include/linux/amba/kmi.h
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
 -S:    Orphan
 +M:    Russell King <[email protected]>
 +S:    Maintained
  F:    drivers/mmc/host/mmci.*
 +F:    include/linux/amba/mmci.h
 +
 +ARM PRIMECELL UART PL010 AND PL011 DRIVERS
 +M:    Russell King <[email protected]>
 +S:    Maintained
 +F:    drivers/tty/serial/amba-pl01*.c
 +F:    include/linux/amba/serial.h
  
  ARM PRIMECELL BUS SUPPORT
  M:    Russell King <[email protected]>
@@@ -1015,6 -1005,7 +1015,6 @@@ F:      drivers/mmc/host/msm_sdcc.
  F:    drivers/mmc/host/msm_sdcc.h
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
 -F:    drivers/platform/msm/
  F:    drivers/*/pm8???-*
  F:    include/linux/mfd/pm8xxx/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
@@@ -1078,6 -1069,7 +1078,6 @@@ M:      Russell King <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
 -F:    arch/arm/common/time-acorn.c
  F:    arch/arm/include/asm/hardware/entry-macro-iomd.S
  F:    arch/arm/include/asm/hardware/ioc.h
  F:    arch/arm/include/asm/hardware/iomd.h
@@@ -1102,6 -1094,7 +1102,6 @@@ W:      http://www.fluff.org/ben/linux
  S:    Maintained
  F:    arch/arm/plat-samsung/
  F:    arch/arm/plat-s3c24xx/
 -F:    arch/arm/plat-s5p/
  F:    arch/arm/mach-s3c24*/
  F:    arch/arm/mach-s3c64xx/
  F:    drivers/*/*s3c2410*
@@@ -1132,6 -1125,7 +1132,6 @@@ M:      Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    arch/arm/plat-s5p/dev-fimc*
  F:    arch/arm/plat-samsung/include/plat/*fimc*
  F:    drivers/media/platform/s5p-fimc/
  
@@@ -1142,7 -1136,7 +1142,7 @@@ M:      Jeongtae Park <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    arch/arm/plat-s5p/dev-mfc.c
 +F:    arch/arm/plat-samsung/s5p-dev-mfc.c
  F:    drivers/media/platform/s5p-mfc/
  
  ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
@@@ -1256,17 -1250,12 +1256,17 @@@ M:   Tony Prisk <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-vt8500/
 +F:    drivers/clocksource/vt8500_timer.c
 +F:    drivers/gpio/gpio-vt8500.c
 +F:    drivers/mmc/host/wmt-sdmmc.c
 +F:    drivers/pwm/pwm-vt8500.c
 +F:    drivers/rtc/rtc-vt8500.c
 +F:    drivers/tty/serial/vt8500_serial.c
 +F:    drivers/usb/host/ehci-vt8500.c
 +F:    drivers/usb/host/uhci-platform.c
  F:    drivers/video/vt8500lcdfb.*
  F:    drivers/video/wm8505fb*
  F:    drivers/video/wmt_ge_rops.*
 -F:    drivers/tty/serial/vt8500_serial.c
 -F:    drivers/rtc/rtc-vt8500-c
 -F:    drivers/mmc/host/wmt-sdmmc.c
  
  ARM/ZIPIT Z2 SUPPORT
  M:    Marek Vasut <[email protected]>
@@@ -1275,14 -1264,6 +1275,14 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/z2.c
  F:    arch/arm/mach-pxa/include/mach/z2.h
  
 +ARM/ZYNQ ARCHITECTURE
 +M:    Michal Simek <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://wiki.xilinx.com
 +T:    git git://git.xilinx.com/linux-xlnx.git
 +S:    Supported
 +F:    arch/arm/mach-zynq/
 +
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <[email protected]>
  M:    Will Deacon <[email protected]>
@@@ -1324,7 -1305,7 +1324,7 @@@ F:      include/linux/dmaengine.
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Wolfram Sang <w.sang@pengutronix.de>
 +M:    Wolfram Sang <wsa@the-dreams.de>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/eeprom/at24.c
@@@ -1372,14 -1353,6 +1372,14 @@@ W:    http://wireless.kernel.org/en/users/
  S:    Supported
  F:    drivers/net/wireless/ath/ath9k/
  
 +WILOCITY WIL6210 WIRELESS DRIVER
 +M:    Vladimir Kondratiev <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +W:    http://wireless.kernel.org/en/users/Drivers/wil6210
 +F:    drivers/net/wireless/ath/wil6210/
 +
  CARL9170 LINUX COMMUNITY WIRELESS DRIVER
  M:    Christian Lamparter <[email protected]>
  L:    [email protected]
@@@ -1415,7 -1388,6 +1415,7 @@@ W:      http://linux-atm.sourceforge.ne
  S:    Maintained
  F:    drivers/atm/
  F:    include/linux/atm*
 +F:    include/uapi/linux/atm*
  
  ATMEL AT91 / AT32 MCI DRIVER
  M:    Ludovic Desroches <[email protected]>
@@@ -1434,13 -1406,13 +1434,13 @@@ L:   [email protected]
  S:    Supported
  F:    drivers/dma/at_hdmac.c
  F:    drivers/dma/at_hdmac_regs.h
 -F:    arch/arm/mach-at91/include/mach/at_hdmac.h
 +F:    include/linux/platform_data/dma-atmel.h
  
  ATMEL ISI DRIVER
  M:    Josh Wu <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/media/platform/atmel-isi.c
 +F:    drivers/media/platform/soc_camera/atmel-isi.c
  F:    include/media/atmel-isi.h
  
  ATMEL LCDFB DRIVER
@@@ -1495,7 -1467,6 +1495,7 @@@ W:      http://people.redhat.com/sgrubb/audi
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
  S:    Maintained
  F:    include/linux/audit.h
 +F:    include/uapi/linux/audit.h
  F:    kernel/audit*
  
  AUXILIARY DISPLAY DRIVERS
@@@ -1510,7 -1481,7 +1510,7 @@@ AVR32 ARCHITECTUR
  M:    Haavard Skinnemoen <[email protected]>
  M:    Hans-Christian Egtvedt <[email protected]>
  W:    http://www.atmel.com/products/AVR32/
 -W:    http://avr32linux.org/
 +W:    http://mirror.egtvedt.no/avr32linux.org/
  W:    http://avrfreaks.net/
  S:    Maintained
  F:    arch/avr32/
@@@ -1526,7 -1497,7 +1526,7 @@@ M:      Ralf Baechle <[email protected]
  L:    [email protected]
  W:    http://www.linux-ax25.org/
  S:    Maintained
 -F:    include/linux/ax25.h
 +F:    include/uapi/linux/ax25.h
  F:    include/net/ax25.h
  F:    net/ax25/
  
@@@ -1587,7 -1558,7 +1587,7 @@@ M:      "Tigran A. Aivazian" <tigran@aivazia
  S:    Maintained
  F:    Documentation/filesystems/bfs.txt
  F:    fs/bfs/
 -F:    include/linux/bfs_fs.h
 +F:    include/uapi/linux/bfs_fs.h
  
  BLACKFIN ARCHITECTURE
  M:    Mike Frysinger <[email protected]>
@@@ -1684,7 -1655,7 +1684,7 @@@ L:      [email protected]
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
  F:    drivers/net/bonding/
 -F:    include/linux/if_bonding.h
 +F:    include/uapi/linux/if_bonding.h
  
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Gary Zambrano <[email protected]>
@@@ -1763,7 -1734,6 +1763,7 @@@ L:      [email protected]
  S:    Supported
  F:    block/bsg.c
  F:    include/linux/bsg.h
 +F:    include/uapi/linux/bsg.h
  
  BT87X AUDIO DRIVER
  M:    Clemens Ladisch <[email protected]>
@@@ -1834,7 -1804,7 +1834,7 @@@ L:      [email protected]
  S:    Supported
  F:    Documentation/networking/caif/
  F:    drivers/net/caif/
 -F:    include/linux/caif/
 +F:    include/uapi/linux/caif/
  F:    include/net/caif/
  F:    net/caif/
  
@@@ -1855,11 -1825,11 +1855,11 @@@ W:   http://gitorious.org/linux-ca
  T:    git git://gitorious.org/linux-can/linux-can-next.git
  S:    Maintained
  F:    net/can/
 -F:    include/linux/can.h
  F:    include/linux/can/core.h
 -F:    include/linux/can/bcm.h
 -F:    include/linux/can/raw.h
 -F:    include/linux/can/gw.h
 +F:    include/uapi/linux/can.h
 +F:    include/uapi/linux/can/bcm.h
 +F:    include/uapi/linux/can/raw.h
 +F:    include/uapi/linux/can/gw.h
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <[email protected]>
@@@ -1870,16 -1840,15 +1870,16 @@@ T:   git git://gitorious.org/linux-can/li
  S:    Maintained
  F:    drivers/net/can/
  F:    include/linux/can/dev.h
 -F:    include/linux/can/error.h
 -F:    include/linux/can/netlink.h
  F:    include/linux/can/platform/
 +F:    include/uapi/linux/can/error.h
 +F:    include/uapi/linux/can/netlink.h
  
  CAPABILITIES
  M:    Serge Hallyn <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    include/linux/capability.h
 +F:    include/uapi/linux/capability.h
  F:    security/capability.c
  F:    security/commoncap.c
  F:    kernel/capability.c
@@@ -1892,7 -1861,6 +1892,7 @@@ W:      http://www.ibm.com/developerworks/po
  S:    Supported
  F:    arch/powerpc/include/asm/cell*.h
  F:    arch/powerpc/include/asm/spu*.h
 +F:    arch/powerpc/include/uapi/asm/spu*.h
  F:    arch/powerpc/oprofile/*cell*
  F:    arch/powerpc/platforms/cell/
  
@@@ -1941,7 -1909,7 +1941,7 @@@ W:      http://wireless.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
  S:    Maintained
 -F:    include/linux/nl80211.h
 +F:    include/uapi/linux/nl80211.h
  F:    include/net/cfg80211.h
  F:    net/wireless/*
  X:    net/wireless/wext*
@@@ -1956,8 -1924,7 +1956,8 @@@ F:      drivers/misc/
  
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
 -S:    Supported
 +M:    Joe Perches <[email protected]>
 +S:    Maintained
  F:    scripts/checkpatch.pl
  
  CHINESE DOCUMENTATION
@@@ -1994,9 -1961,9 +1994,9 @@@ S:      Maintaine
  F:    drivers/usb/host/ohci-ep93xx.c
  
  CIRRUS LOGIC CS4270 SOUND DRIVER
 -M:    Timur Tabi <timur@freescale.com>
 +M:    Timur Tabi <timur@tabi.org>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Odd Fixes
  F:    sound/soc/codecs/cs4270*
  
  CLEANCACHE API
@@@ -2045,7 -2012,6 +2045,7 @@@ S:      Maintaine
  F:    Documentation/filesystems/coda.txt
  F:    fs/coda/
  F:    include/linux/coda*.h
 +F:    include/uapi/linux/coda*.h
  
  COMMON CLK FRAMEWORK
  M:    Mike Turquette <[email protected]>
@@@ -2162,10 -2128,10 +2162,10 @@@ S:   Maintaine
  F:    tools/power/cpupower
  
  CPUSETS
 -M:    Paul Menage <[email protected]>
 +M:    Li Zefan <[email protected]>
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
 -S:    Supported
 +S:    Maintained
  F:    Documentation/cgroups/cpusets.txt
  F:    include/linux/cpuset.h
  F:    kernel/cpuset.c
@@@ -2300,7 -2266,6 +2300,7 @@@ W:      http://www.cyclades.com
  S:    Orphan
  F:    drivers/tty/cyclades.c
  F:    include/linux/cyclades.h
 +F:    include/uapi/linux/cyclades.h
  
  CYCLADES PC300 DRIVER
  W:    http://www.cyclades.com/
@@@ -2358,7 -2323,6 +2358,7 @@@ L:      [email protected]
  W:    http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
  S:    Maintained
  F:    include/linux/dccp.h
 +F:    include/uapi/linux/dccp.h
  F:    include/linux/tfrc.h
  F:    net/dccp/
  
@@@ -2385,7 -2349,7 +2385,7 @@@ M:      Massimo Dal Zotto <[email protected]
  W:    http://www.debian.org/~dz/i8k/
  S:    Maintained
  F:    drivers/char/i8k.c
 -F:    include/linux/i8k.h
 +F:    include/uapi/linux/i8k.h
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
  M:    Doug Warzecha <[email protected]>
@@@ -2458,7 -2422,6 +2458,7 @@@ S:      Maintaine
  F:    Documentation/filesystems/quota.txt
  F:    fs/quota/
  F:    include/linux/quota*.h
 +F:    include/uapi/linux/quota*.h
  
  DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB)
  M:    Bernie Thompson <[email protected]>
@@@ -2565,7 -2528,6 +2565,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/gpu/drm/
  F:    include/drm/
 +F:    include/uapi/drm/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <[email protected]>
@@@ -2575,7 -2537,6 +2575,7 @@@ T:      git git://people.freedesktop.org/~da
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
 +F:    include/uapi/drm/i915*
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
@@@ -2587,7 -2548,6 +2587,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/gpu/drm/exynos
  F:    include/drm/exynos*
 +F:    include/uapi/drm/exynos*
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
@@@ -2662,7 -2622,7 +2662,7 @@@ W:      http://github.com/mkrufk
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
 -F:    drivers/media/usb/dvb-usb-v2/cxusb*
 +F:    drivers/media/usb/dvb-usb/cxusb*
  
  DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -2762,7 -2722,6 +2762,7 @@@ L:      [email protected]
  W:    http://ebtables.sourceforge.net/
  S:    Maintained
  F:    include/linux/netfilter_bridge/ebt_*.h
 +F:    include/uapi/linux/netfilter_bridge/ebt_*.h
  F:    net/bridge/netfilter/ebt*.c
  
  EC100 MEDIA DRIVER
@@@ -2974,6 -2933,12 +2974,6 @@@ M:     Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/media/rc/ene_ir.*
  
 -EPSON 1355 FRAMEBUFFER DRIVER
 -M:    Christopher Hoover <[email protected]>
 -M:    Christopher Hoover <[email protected]>
 -S:    Maintained
 -F:    drivers/video/epson1355fb.c
 -
  EPSON S1D13XXX FRAMEBUFFER DRIVER
  M:    Kristoffer Ericson <[email protected]>
  S:    Maintained
@@@ -2988,7 -2953,7 +2988,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/i825xx/eexpress.*
  
  ETHERNET BRIDGE
 -M:    Stephen Hemminger <s[email protected]>
 +M:    Stephen Hemminger <s[email protected]>
  L:    [email protected]
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net:Bridge
@@@ -2996,6 -2961,11 +2996,6 @@@ S:     Maintaine
  F:    include/linux/netfilter_bridge/
  F:    net/bridge/
  
 -ETHERTEAM 16I DRIVER
 -M:    Mika Kuoppala <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/fujitsu/eth16i.c
 -
  EXT2 FILE SYSTEM
  M:    Jan Kara <[email protected]>
  L:    [email protected]
@@@ -3081,7 -3051,6 +3081,7 @@@ M:      Eric Paris <[email protected]
  S:    Maintained
  F:    fs/notify/fanotify/
  F:    include/linux/fanotify.h
 +F:    include/uapi/linux/fanotify.h
  
  FARSYNC SYNCHRONOUS DRIVER
  M:    Kevin Curtis <[email protected]>
@@@ -3105,7 -3074,6 +3105,7 @@@ F:      drivers/scsi/fcoe
  F:    include/scsi/fc/
  F:    include/scsi/libfc.h
  F:    include/scsi/libfcoe.h
 +F:    include/uapi/scsi/fc/
  
  FILE LOCKING (flock() and fcntl()/lockf())
  M:    Matthew Wilcox <[email protected]>
@@@ -3113,8 -3081,6 +3113,8 @@@ L:      [email protected]
  S:    Maintained
  F:    include/linux/fcntl.h
  F:    include/linux/fs.h
 +F:    include/uapi/linux/fcntl.h
 +F:    include/uapi/linux/fs.h
  F:    fs/fcntl.c
  F:    fs/locks.c
  
@@@ -3204,13 -3170,11 +3204,13 @@@ F:   Documentation/devicetree/bindings/fb
  F:    drivers/video/
  F:    include/video/
  F:    include/linux/fb.h
 +F:    include/uapi/video/
 +F:    include/uapi/linux/fb.h
  
  FREESCALE DIU FRAMEBUFFER DRIVER
 -M:    Timur Tabi <timur@freescale.com>
 +M:    Timur Tabi <timur@tabi.org>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/video/fsl-diu-fb.*
  
  FREESCALE DMA DRIVER
@@@ -3232,7 -3196,7 +3232,7 @@@ M:      Sascha Hauer <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    arch/arm/plat-mxc/include/mach/imxfb.h
 +F:    include/linux/platform_data/video-imxfb.h
  F:    drivers/video/imxfb.c
  
  FREESCALE SOC FS_ENET DRIVER
@@@ -3245,8 -3209,9 +3245,8 @@@ F:      drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE QUICC ENGINE LIBRARY
 -M:    Timur Tabi <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  F:    arch/powerpc/sysdev/qe_lib/
  F:    arch/powerpc/include/asm/*qe.h
  
@@@ -3265,16 -3230,16 +3265,16 @@@ S:   Maintaine
  F:    drivers/net/ethernet/freescale/ucc_geth*
  
  FREESCALE QUICC ENGINE UCC UART DRIVER
 -M:    Timur Tabi <timur@freescale.com>
 +M:    Timur Tabi <timur@tabi.org>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/tty/serial/ucc_uart.c
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Timur Tabi <timur@freescale.com>
 +M:    Timur Tabi <timur@tabi.org>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    sound/soc/fsl/fsl*
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
@@@ -3308,16 -3273,6 +3308,16 @@@ F:    Documentation/filesystems/caching
  F:    fs/fscache/
  F:    include/linux/fscache*.h
  
 +F2FS FILE SYSTEM
 +M:    Jaegeuk Kim <[email protected]>
 +L:    [email protected]
 +W:    http://en.wikipedia.org/wiki/F2FS
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 +S:    Maintained
 +F:    Documentation/filesystems/f2fs.txt
 +F:    fs/f2fs/
 +F:    include/linux/f2fs_fs.h
 +
  FUJITSU FR-V (FRV) PORT
  M:    David Howells <[email protected]>
  S:    Maintained
@@@ -3349,7 -3304,7 +3349,7 @@@ L:      [email protected]
  W:    http://fuse.sourceforge.net/
  S:    Maintained
  F:    fs/fuse/
 -F:    include/linux/fuse.h
 +F:    include/uapi/linux/fuse.h
  
  FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
  M:    Rik Faith <[email protected]>
@@@ -3396,7 -3351,6 +3396,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
  S:    Maintained
  F:    include/asm-generic
 +F:    include/uapi/asm-generic
  
  GENERIC UIO DRIVER FOR PCI DEVICES
  M:    "Michael S. Tsirkin" <[email protected]>
@@@ -3413,7 -3367,7 +3413,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    Documentation/filesystems/gfs2*.txt
  F:    fs/gfs2/
 -F:    include/linux/gfs2_ondisk.h
 +F:    include/uapi/linux/gfs2_ondisk.h
  
  GIGASET ISDN DRIVERS
  M:    Hansjoerg Lipp <[email protected]>
@@@ -3423,7 -3377,7 +3423,7 @@@ W:      http://gigaset307x.sourceforge.net
  S:    Maintained
  F:    Documentation/isdn/README.gigaset
  F:    drivers/isdn/gigaset/
 -F:    include/linux/gigaset_dev.h
 +F:    include/uapi/linux/gigaset_dev.h
  
  GPIO SUBSYSTEM
  M:    Grant Likely <[email protected]>
@@@ -3580,7 -3534,6 +3580,7 @@@ S:      Supporte
  F:    Documentation/scsi/hpsa.txt
  F:    drivers/scsi/hpsa*.[ch]
  F:    include/linux/cciss*.h
 +F:    include/uapi/linux/cciss*.h
  
  HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
  M:    Mike Miller <[email protected]>
@@@ -3589,7 -3542,6 +3589,7 @@@ S:      Supporte
  F:    Documentation/blockdev/cciss.txt
  F:    drivers/block/cciss*
  F:    include/linux/cciss_ioctl.h
 +F:    include/uapi/linux/cciss_ioctl.h
  
  HFS FILESYSTEM
  L:    [email protected]
@@@ -3624,7 -3576,6 +3624,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/hid/
  F:    include/linux/hid*
 +F:    include/uapi/linux/hid*
  
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  M:    Thomas Gleixner <[email protected]>
@@@ -3656,7 -3607,7 +3656,7 @@@ M:      Jes Sorensen <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    include/linux/hippidevice.h
 -F:    include/linux/if_hippi.h
 +F:    include/uapi/linux/if_hippi.h
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
@@@ -3684,7 -3635,6 +3684,7 @@@ S:      Maintaine
  F:    Documentation/timers/hpet.txt
  F:    drivers/char/hpet.c
  F:    include/linux/hpet.h
 +F:    include/uapi/linux/hpet.h
  
  HPET: x86
  M:    "Venkatesh Pallipadi (Venki)" <[email protected]>
@@@ -3774,18 -3724,17 +3774,18 @@@ S:   Maintaine
  F:    drivers/i2c/i2c-stub.c
  
  I2C SUBSYSTEM
 -M:    Wolfram Sang <w.sang@pengutronix.de>
 +M:    Wolfram Sang <wsa@the-dreams.de>
  M:    "Ben Dooks (embedded platforms)" <[email protected]>
  L:    [email protected]
  W:    http://i2c.wiki.kernel.org/
 -T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
 -T:    git git://git.pengutronix.de/git/wsa/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
  S:    Maintained
  F:    Documentation/i2c/
  F:    drivers/i2c/
  F:    include/linux/i2c.h
  F:    include/linux/i2c-*.h
 +F:    include/uapi/linux/i2c.h
 +F:    include/uapi/linux/i2c-*.h
  
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <[email protected]>
@@@ -3901,7 -3850,7 +3901,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    net/ieee802154/
  F:    net/mac802154/
 -F:    drivers/ieee802154/
 +F:    drivers/net/ieee802154/
  
  IGUANAWORKS USB IR TRANSCEIVER
  M:    Sean Young <[email protected]>
@@@ -3952,7 -3901,7 +3952,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    Documentation/infiniband/
  F:    drivers/infiniband/
 -F:    include/linux/if_infiniband.h
 +F:    include/uapi/linux/if_infiniband.h
  
  INOTIFY
  M:    John McCutchan <[email protected]>
@@@ -3962,7 -3911,6 +3962,7 @@@ S:      Maintaine
  F:    Documentation/filesystems/inotify.txt
  F:    fs/notify/inotify/
  F:    include/linux/inotify.h
 +F:    include/uapi/linux/inotify.h
  
  INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
  M:    Dmitry Torokhov <[email protected]>
@@@ -3973,7 -3921,6 +3973,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/input/
  F:    include/linux/input.h
 +F:    include/uapi/linux/input.h
  F:    include/linux/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
@@@ -3994,6 -3941,7 +3994,6 @@@ L:      [email protected]
  T:    git git://git.code.sf.net/p/intel-sas/isci
  S:    Supported
  F:    drivers/scsi/isci/
 -F:    firmware/isci/
  
  INTEL IDLE DRIVER
  M:    Len Brown <[email protected]>
@@@ -4088,6 -4036,12 +4088,6 @@@ F:     Documentation/networking/ixgbe.tx
  F:    Documentation/networking/ixgbevf.txt
  F:    drivers/net/ethernet/intel/
  
 -INTEL MRST PMU DRIVER
 -M:    Len Brown <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    arch/x86/platform/mrst/pmu.*
 -
  INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
  M:    Stanislav Yakovlev <[email protected]>
  L:    [email protected]
@@@ -4116,7 -4070,7 +4116,7 @@@ S:      Supporte
  W:    http://linuxwimax.org
  F:    Documentation/wimax/README.i2400m
  F:    drivers/net/wimax/i2400m/
 -F:    include/linux/wimax/i2400m.h
 +F:    include/uapi/linux/wimax/i2400m.h
  
  INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
  M:    Stanislaw Gruszka <[email protected]>
@@@ -4138,9 -4092,9 +4138,9 @@@ INTEL MANAGEMENT ENGINE (mei
  M:    Tomas Winkler <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    include/linux/mei.h
 +F:    include/uapi/linux/mei.h
  F:    drivers/misc/mei/*
 -F:    Documentation/mei/*
 +F:    Documentation/misc-devices/mei/*
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <[email protected]>
@@@ -4180,7 -4134,6 +4180,7 @@@ S:      Supporte
  F:    Documentation/IPMI.txt
  F:    drivers/char/ipmi/
  F:    include/linux/ipmi*
 +F:    include/uapi/linux/ipmi*
  
  IPS SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <[email protected]>
@@@ -4198,7 -4151,7 +4198,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/networking/ipvs-sysctl.txt
  F:    include/net/ip_vs.h
 -F:    include/linux/ip_vs.h
 +F:    include/uapi/linux/ip_vs.h
  F:    net/netfilter/ipvs/
  
  IPWIRELESS DRIVER
@@@ -4211,8 -4164,8 +4211,8 @@@ IPX NETWORK LAYE
  M:    Arnaldo Carvalho de Melo <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    include/linux/ipx.h
  F:    include/net/ipx.h
 +F:    include/uapi/linux/ipx.h
  F:    net/ipx/
  
  IRDA SUBSYSTEM
@@@ -4232,7 -4185,6 +4232,7 @@@ M:      Thomas Gleixner <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
 +F:    drivers/irqchip/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Benjamin Herrenschmidt <[email protected]>
@@@ -4276,8 -4228,6 +4276,8 @@@ F:      Documentation/isdn
  F:    drivers/isdn/
  F:    include/linux/isdn.h
  F:    include/linux/isdn/
 +F:    include/uapi/linux/isdn.h
 +F:    include/uapi/linux/isdn/
  
  ISDN SUBSYSTEM (Eicon active card driver)
  M:    Armin Schindler <[email protected]>
@@@ -4318,7 -4268,7 +4318,7 @@@ W:      http://www.ivtvdriver.or
  S:    Maintained
  F:    Documentation/video4linux/*.ivtv
  F:    drivers/media/pci/ivtv/
 -F:    include/linux/ivtv*
 +F:    include/uapi/linux/ivtv*
  
  IX2505V MEDIA DRIVER
  M:    Malcolm Priestley <[email protected]>
@@@ -4356,7 -4306,7 +4356,7 @@@ L:      [email protected]
  W:    http://www.linux-mtd.infradead.org/doc/jffs2.html
  S:    Maintained
  F:    fs/jffs2/
 -F:    include/linux/jffs2.h
 +F:    include/uapi/linux/jffs2.h
  
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
  M:    Andrew Morton <[email protected]>
@@@ -4439,13 -4389,11 +4439,13 @@@ W:   http://nfs.sourceforge.net
  S:    Supported
  F:    fs/nfsd/
  F:    include/linux/nfsd/
 +F:    include/uapi/linux/nfsd/
  F:    fs/lockd/
  F:    fs/nfs_common/
  F:    net/sunrpc/
  F:    include/linux/lockd/
  F:    include/linux/sunrpc/
 +F:    include/uapi/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Marcelo Tosatti <[email protected]>
@@@ -4457,7 -4405,6 +4457,7 @@@ F:      Documentation/*/kvm.tx
  F:    arch/*/kvm/
  F:    arch/*/include/asm/kvm*
  F:    include/linux/kvm*
 +F:    include/uapi/linux/kvm*
  F:    virt/kvm/
  
  KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
@@@ -4498,22 -4445,12 +4498,22 @@@ F:   arch/s390/include/asm/kvm
  F:    arch/s390/kvm/
  F:    drivers/s390/kvm/
  
 +KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 +M:    Christoffer Dall <[email protected]>
 +L:    [email protected]
 +W:    http://systems.cs.columbia.edu/projects/kvm-arm
 +S:    Maintained
 +F:    arch/arm/include/uapi/asm/kvm*
 +F:    arch/arm/include/asm/kvm*
 +F:    arch/arm/kvm/
 +
  KEXEC
  M:    Eric Biederman <[email protected]>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
  L:    [email protected]
  S:    Maintained
  F:    include/linux/kexec.h
 +F:    include/uapi/linux/kexec.h
  F:    kernel/kexec.c
  
  KEYS/KEYRINGS:
@@@ -4755,7 -4692,6 +4755,7 @@@ LLC (802.2
  M:    Arnaldo Carvalho de Melo <[email protected]>
  S:    Maintained
  F:    include/linux/llc.h
 +F:    include/uapi/linux/llc.h
  F:    include/net/llc*
  F:    net/llc/
  
@@@ -4931,7 -4867,7 +4931,7 @@@ S:      Maintaine
  
  MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
  M:    Mirko Lindner <[email protected]>
 -M:    Stephen Hemminger <s[email protected]>
 +M:    Stephen Hemminger <s[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/marvell/sk*
@@@ -4976,7 -4912,7 +4976,7 @@@ MATROX FRAMEBUFFER DRIVE
  L:    [email protected]
  S:    Orphan
  F:    drivers/video/matrox/matroxfb_*
 -F:    include/linux/matroxfb.h
 +F:    include/uapi/linux/matroxfb.h
  
  MAX16065 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
@@@ -5036,10 -4972,6 +5036,10 @@@ L:    [email protected]
  W:    http://www.linux-mm.org
  S:    Maintained
  F:    include/linux/mm.h
 +F:    include/linux/gfp.h
 +F:    include/linux/mmzone.h
 +F:    include/linux/memory_hotplug.h
 +F:    include/linux/vmalloc.h
  F:    mm/
  
  MEMORY RESOURCE CONTROLLER
@@@ -5062,7 -4994,7 +5062,7 @@@ T:      git git://git.infradead.org/mtd-2.6.
  S:    Maintained
  F:    drivers/mtd/
  F:    include/linux/mtd/
 -F:    include/mtd/
 +F:    include/uapi/mtd/
  
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
@@@ -5100,6 -5032,12 +5100,6 @@@ F:     Documentation/video4linux/meye.tx
  F:    drivers/media/pci/meye/
  F:    include/uapi/linux/meye.h
  
 -MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
 -M:    Pavel Pisa <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    drivers/mmc/host/imxmmc.*
 -
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
@@@ -5114,7 -5052,7 +5114,7 @@@ S:      Maintaine
  F:    drivers/media/radio/radio-mr800.c
  
  MSI LAPTOP SUPPORT
 -M:    "Lee, Chun-Yi" <jlee@novell.com>
 +M:    "Lee, Chun-Yi" <jlee@suse.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/msi-laptop.c
@@@ -5138,7 -5076,6 +5138,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/mmc/
  F:    include/linux/mmc/
 +F:    include/uapi/linux/mmc/
  
  MULTIMEDIA CARD (MMC) ETC. OVER SPI
  S:    Orphan
@@@ -5210,7 -5147,7 +5210,7 @@@ S:      Supporte
  F:    drivers/infiniband/hw/nes/
  
  NETEM NETWORK EMULATOR
 -M:    Stephen Hemminger <s[email protected]>
 +M:    Stephen Hemminger <s[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    net/sched/sch_netem.c
@@@ -5239,8 -5176,6 +5239,8 @@@ S:      Supporte
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
  F:    include/net/netfilter/
 +F:    include/uapi/linux/netfilter*
 +F:    include/uapi/linux/netfilter/
  F:    net/*/netfilter.c
  F:    net/*/netfilter/
  F:    net/netfilter/
@@@ -5259,8 -5194,8 +5259,8 @@@ M:      Ralf Baechle <[email protected]
  L:    [email protected]
  W:    http://www.linux-ax25.org/
  S:    Maintained
 -F:    include/linux/netrom.h
  F:    include/net/netrom.h
 +F:    include/uapi/linux/netrom.h
  F:    net/netrom/
  
  NETWORK BLOCK DEVICE (NBD)
@@@ -5269,7 -5204,6 +5269,7 @@@ S:      Maintaine
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
 +F:    include/uapi/linux/nbd.h
  
  NETWORK DROP MONITOR
  M:    Neil Horman <[email protected]>
@@@ -5291,9 -5225,6 +5291,9 @@@ F:      include/net
  F:    include/linux/in.h
  F:    include/linux/net.h
  F:    include/linux/netdevice.h
 +F:    include/uapi/linux/in.h
 +F:    include/uapi/linux/net.h
 +F:    include/uapi/linux/netdevice.h
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
@@@ -5339,7 -5270,6 +5339,7 @@@ F:      net/rfkill
  F:    net/wireless/
  F:    include/net/ieee80211*
  F:    include/linux/wireless.h
 +F:    include/uapi/linux/wireless.h
  F:    include/net/iw_handler.h
  F:    drivers/net/wireless/
  
@@@ -5359,8 -5289,6 +5359,8 @@@ F:      include/linux/fcdevice.
  F:    include/linux/fddidevice.h
  F:    include/linux/hippidevice.h
  F:    include/linux/inetdevice.h
 +F:    include/uapi/linux/if_*
 +F:    include/uapi/linux/netdevice.h
  
  NETXEN (1/10) GbE SUPPORT
  M:    Sony Chacko <[email protected]>
@@@ -5378,8 -5306,8 +5378,8 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    net/nfc/
 -F:    include/linux/nfc.h
  F:    include/net/nfc/
 +F:    include/uapi/linux/nfc.h
  F:    drivers/nfc/
  F:    include/linux/platform_data/pn544.h
  
@@@ -5396,8 -5324,13 +5396,8 @@@ F:     net/sunrpc
  F:    include/linux/lockd/
  F:    include/linux/nfs*
  F:    include/linux/sunrpc/
 -
 -NI5010 NETWORK DRIVER
 -M:    Jan-Pascal van Best <[email protected]>
 -M:    Andreas Mohr <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/racal/ni5010.*
 +F:    include/uapi/linux/nfs*
 +F:    include/uapi/linux/sunrpc/
  
  NILFS2 FILESYSTEM
  M:    KONISHI Ryusuke <[email protected]>
@@@ -5424,13 -5357,6 +5424,13 @@@ S:    Maintaine
  F:    Documentation/scsi/NinjaSCSI.txt
  F:    drivers/scsi/nsp32*
  
 +NTB DRIVER
 +M:    Jon Mason <[email protected]>
 +S:    Supported
 +F:    drivers/ntb/
 +F:    drivers/net/ntb_netdev.c
 +F:    include/linux/ntb.h
 +
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <[email protected]>
  L:    [email protected]
@@@ -5544,7 -5470,8 +5544,7 @@@ M:      Benoît Cousson <[email protected]
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    arch/arm/mach-omap2/omap_hwmod.c
 -F:    arch/arm/plat-omap/include/plat/omap_hwmod.h
 +F:    arch/arm/mach-omap2/omap_hwmod.*
  
  OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
  M:    Benoît Cousson <[email protected]>
@@@ -5586,7 -5513,6 +5586,7 @@@ M:      Harald Welte <[email protected]
  S:    Maintained
  F:    drivers/char/pcmcia/cm4000_cs.c
  F:    include/linux/cm4000_cs.h
 +F:    include/uapi/linux/cm4000_cs.h
  
  OMNIKEY CARDMAN 4040 DRIVER
  M:    Harald Welte <[email protected]>
@@@ -5745,7 -5671,7 +5745,7 @@@ S:      Orpha
  F:    drivers/parport/
  F:    include/linux/parport*.h
  F:    drivers/char/ppdev.c
 -F:    include/linux/ppdev.h
 +F:    include/uapi/linux/ppdev.h
  
  PARAVIRT_OPS INTERFACE
  M:    Jeremy Fitzhardinge <[email protected]>
@@@ -5808,6 -5734,15 +5808,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
 -PCA9564/PCA9665 I2C BUS DRIVER
 -M:    Wolfram Sang <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/i2c/algos/i2c-algo-pca.c
 -F:    drivers/i2c/busses/i2c-pca-*
 -F:    include/linux/i2c-algo-pca.h
 -F:    include/linux/i2c-pca-platform.h
 -
  PCDP - PRIMARY CONSOLE AND DEBUG PORT
  M:    Khalid Aziz <[email protected]>
  S:    Maintained
@@@ -5877,11 -5812,11 +5877,11 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    kernel/events/*
  F:    include/linux/perf_event.h
 +F:    include/uapi/linux/perf_event.h
  F:    arch/*/kernel/perf_event*.c
  F:    arch/*/kernel/*/perf_event*.c
  F:    arch/*/kernel/*/*/perf_event*.c
  F:    arch/*/include/asm/perf_event.h
 -F:    arch/*/lib/perf_event*.c
  F:    arch/*/kernel/perf_callchain.c
  F:    tools/perf/
  
@@@ -5890,7 -5825,6 +5890,7 @@@ M:      Christoph Hellwig <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    include/linux/personality.h
 +F:    include/uapi/linux/personality.h
  
  PHONET PROTOCOL
  M:    Remi Denis-Courmont <[email protected]>
@@@ -5898,7 -5832,6 +5898,7 @@@ S:      Supporte
  F:    Documentation/networking/phonet.txt
  F:    include/linux/phonet.h
  F:    include/net/phonet/
 +F:    include/uapi/linux/phonet.h
  F:    net/phonet/
  
  PHRAM MTD DRIVER
@@@ -5947,7 -5880,6 +5947,7 @@@ M:      Jiri Kosina <[email protected]
  S:    Maintained
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
 +F:    include/uapi/linux/pktcdvd.h
  
  PKUNITY SOC DRIVERS
  M:    Guan Xuetao <[email protected]>
@@@ -6022,7 -5954,7 +6022,7 @@@ PPP OVER ATM (RFC 2364
  M:    Mitchell Blank Jr <[email protected]>
  S:    Maintained
  F:    net/atm/pppoatm.c
 -F:    include/linux/atmppp.h
 +F:    include/uapi/linux/atmppp.h
  
  PPP OVER ETHERNET
  M:    Michal Ostrowski <[email protected]>
@@@ -6035,7 -5967,6 +6035,7 @@@ M:      James Chapman <[email protected]
  S:    Maintained
  F:    net/l2tp/l2tp_ppp.c
  F:    include/linux/if_pppol2tp.h
 +F:    include/uapi/linux/if_pppol2tp.h
  
  PPS SUPPORT
  M:    Rodolfo Giometti <[email protected]>
@@@ -6133,7 -6064,6 +6133,7 @@@ F:      include/asm-generic/syscall.
  F:    include/linux/ptrace.h
  F:    include/linux/regset.h
  F:    include/linux/tracehook.h
 +F:    include/uapi/linux/ptrace.h
  F:    kernel/ptrace.c
  
  PVRUSB2 VIDEO4LINUX DRIVER
@@@ -6162,6 -6092,7 +6162,6 @@@ T:      git git://gitorious.org/linux-pwm/li
  F:    Documentation/pwm.txt
  F:    Documentation/devicetree/bindings/pwm/
  F:    include/linux/pwm.h
 -F:    include/linux/of_pwm.h
  F:    drivers/pwm/
  F:    drivers/video/backlight/pwm_bl.c
  F:    include/linux/pwm_backlight.h
@@@ -6257,8 -6188,8 +6257,8 @@@ M:      Anders Larsen <[email protected]
  W:    http://www.alarsen.net/linux/qnx4fs/
  S:    Maintained
  F:    fs/qnx4/
 -F:    include/linux/qnx4_fs.h
 -F:    include/linux/qnxtypes.h
 +F:    include/uapi/linux/qnx4_fs.h
 +F:    include/uapi/linux/qnxtypes.h
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -6292,7 -6223,7 +6292,7 @@@ M:      Benjamin Herrenschmidt <benh@kernel.
  L:    [email protected]
  S:    Maintained
  F:    drivers/video/aty/radeon*
 -F:    include/linux/radeonfb.h
 +F:    include/uapi/linux/radeonfb.h
  
  RADIOSHARK RADIO DRIVER
  M:    Hans de Goede <[email protected]>
@@@ -6393,7 -6324,6 +6393,7 @@@ S:      Maintaine
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
  F:    include/linux/rtc.h
 +F:    include/uapi/linux/rtc.h
  
  REISERFS FILE SYSTEM
  L:    [email protected]
@@@ -6448,8 -6378,8 +6448,8 @@@ M:      Ralf Baechle <[email protected]
  L:    [email protected]
  W:    http://www.linux-ax25.org/
  S:    Maintained
 -F:    include/linux/rose.h
  F:    include/net/rose.h
 +F:    include/uapi/linux/rose.h
  F:    net/rose/
  
  RTL2830 MEDIA DRIVER
@@@ -6519,7 -6449,7 +6519,7 @@@ S:      Supporte
  F:    drivers/s390/net/
  
  S390 ZCRYPT DRIVER
 -M:    Holger Dengler <[email protected].ibm.com>
 +M:    Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
  M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -6606,7 -6536,7 +6606,7 @@@ F:      drivers/media/platform/s3c-camif
  F:    include/media/s3c_camif.h
  
  SERIAL DRIVERS
 -M:    Alan Cox <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial
@@@ -6619,15 -6549,13 +6619,15 @@@ F:   drivers/dma/dw_dmac_regs.
  F:    drivers/dma/dw_dmac.c
  
  TIMEKEEPING, NTP
 -M:    John Stultz <john[email protected]>
 +M:    John Stultz <john[email protected]>
  M:    Thomas Gleixner <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    include/linux/clocksource.h
  F:    include/linux/time.h
  F:    include/linux/timex.h
 +F:    include/uapi/linux/time.h
 +F:    include/uapi/linux/timex.h
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
@@@ -6652,7 -6580,6 +6652,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    kernel/sched/
  F:    include/linux/sched.h
 +F:    include/uapi/linux/sched.h
  
  SCORE ARCHITECTURE
  M:    Chen Liqin <[email protected]>
@@@ -6806,7 -6733,7 +6806,7 @@@ SENSABLE PHANTO
  M:    Jiri Slaby <[email protected]>
  S:    Maintained
  F:    drivers/misc/phantom.c
 -F:    include/linux/phantom.h
 +F:    include/uapi/linux/phantom.h
  
  SERIAL ATA (SATA) SUBSYSTEM
  M:    Jeff Garzik <[email protected]>
@@@ -6841,7 -6768,8 +6841,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/sfc/
  
  SGI GRU DRIVER
- M:    Jack Steiner <[email protected]>
+ M:    Dimitri Sivanich <[email protected]>
+ M:    Robin Holt <[email protected]>
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
@@@ -7036,14 -6964,6 +7037,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/video/smscufx.c
  
- SN-IA64 (Itanium) SUB-PLATFORM
- M:    Jes Sorensen <[email protected]>
- L:    [email protected]
- L:    [email protected]
- W:    http://www.sgi.com/altix
- S:    Maintained
- F:    arch/ia64/sn/
- 
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <[email protected]>
  L:    [email protected]
@@@ -7064,7 -6984,6 +7057,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/md/
  F:    include/linux/raid/
 +F:    include/uapi/linux/raid/
  
  SONIC NETWORK DRIVER
  M:    Thomas Bogendoerfer <[email protected]>
@@@ -7105,11 -7024,10 +7098,11 @@@ T:   git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    Documentation/sound/
  F:    include/sound/
 +F:    include/uapi/sound/
  F:    sound/
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
 -M:    Liam Girdwood <lrg@ti.com>
 +M:    Liam Girdwood <lgirdwood@gmail.com>
  M:    Mark Brown <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
  L:    [email protected] (moderated for non-subscribers)
@@@ -7199,7 -7117,6 +7192,7 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Grant Likely <[email protected]>
 +M:    Mark Brown <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -7207,7 -7124,6 +7200,7 @@@ S:      Maintaine
  F:    Documentation/spi/
  F:    drivers/spi/
  F:    include/linux/spi/
 +F:    include/uapi/linux/spi/
  
  SPIDERNET NETWORK DRIVER for CELL
  M:    Ishizaki Kou <[email protected]>
@@@ -7325,7 -7241,8 +7318,7 @@@ S:      Odd Fixe
  F:    drivers/staging/olpc_dcon/
  
  STAGING - OZMO DEVICES USB OVER WIFI DRIVER
 -M:    Rupesh Gujare <[email protected]>
 -M:    Chris Kelly <[email protected]>
 +M:    Rupesh Gujare <[email protected]>
  S:    Maintained
  F:    drivers/staging/ozwpan/
  
@@@ -7343,7 -7260,7 +7336,7 @@@ F:      drivers/staging/rtl8712
  STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
  M:    Teddy Wang <[email protected]>
  S:    Odd Fixes
 -F:    drivers/staging/sm7xx/
 +F:    drivers/staging/sm7xxfb/
  
  STAGING - SOFTLOGIC 6x10 MPEG CODEC
  M:    Ben Collins <[email protected]>
@@@ -7361,7 -7278,7 +7354,7 @@@ S:      Odd Fixe
  F:    drivers/staging/speakup/
  
  STAGING - TI DSP BRIDGE DRIVERS
 -M:    Omar Ramirez Luna <omar.ramirez@ti.com>
 +M:    Omar Ramirez Luna <omar.ramirez@copitl.com>
  S:    Odd Fixes
  F:    drivers/staging/tidspbridge/
  
@@@ -7469,8 -7386,8 +7462,8 @@@ TC CLASSIFIE
  M:    Jamal Hadi Salim <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    include/linux/pkt_cls.h
  F:    include/net/pkt_cls.h
 +F:    include/uapi/linux/pkt_cls.h
  F:    net/sched/
  
  TCP LOW PRIORITY MODULE
@@@ -7557,17 -7474,11 +7550,17 @@@ S:   Maintaine
  F:    drivers/media/tuners/tea5767.*
  
  TEAM DRIVER
 -M:    Jiri Pirko <j[email protected]>
 +M:    Jiri Pirko <j[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/team/
  F:    include/linux/if_team.h
 +F:    include/uapi/linux/if_team.h
 +
 +TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
 +M:    Savoir-faire Linux Inc. <[email protected]>
 +S:    Maintained
 +F:    arch/x86/platform/ts5500/
  
  TECHNOTREND USB IR RECEIVER
  M:    Sean Young <[email protected]>
@@@ -7611,11 -7522,6 +7604,11 @@@ S:      Supporte
  F:      drivers/thermal/
  F:      include/linux/thermal.h
  
 +THINGM BLINK(1) USB RGB LED DRIVER
 +M:    Vivien Didelot <[email protected]>
 +S:    Maintained
 +F:    drivers/hid/hid-thingm.c
 +
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <[email protected]>
  L:    [email protected]
@@@ -7648,22 -7554,6 +7641,22 @@@ F:    Documentation/backlight/lp855x-drive
  F:    drivers/video/backlight/lp855x_bl.c
  F:    include/linux/platform_data/lp855x.h
  
 +TI LP8727 CHARGER DRIVER
 +M:    Milo Kim <[email protected]>
 +S:    Maintained
 +F:    drivers/power/lp8727_charger.c
 +F:    include/linux/platform_data/lp8727.h
 +
 +TI LP8788 MFD DRIVER
 +M:    Milo Kim <[email protected]>
 +S:    Maintained
 +F:    drivers/iio/adc/lp8788_adc.c
 +F:    drivers/leds/leds-lp8788.c
 +F:    drivers/mfd/lp8788*.c
 +F:    drivers/power/lp8788-charger.c
 +F:    drivers/regulator/lp8788-*.c
 +F:    include/linux/mfd/lp8788*.h
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -7687,7 -7577,7 +7680,7 @@@ L:      [email protected] (core kernel 
  L:    [email protected] (user apps, general discussion)
  W:    http://tipc.sourceforge.net/
  S:    Maintained
 -F:    include/linux/tipc*.h
 +F:    include/uapi/linux/tipc*.h
  F:    net/tipc/
  
  TILE ARCHITECTURE
@@@ -7737,7 -7627,6 +7730,7 @@@ W:      http://www.buzzard.org.uk/toshiba
  S:    Maintained
  F:    drivers/char/toshiba.c
  F:    include/linux/toshiba.h
 +F:    include/uapi/linux/toshiba.h
  
  TMIO MMC DRIVER
  M:    Guennadi Liakhovetski <[email protected]>
@@@ -7805,9 -7694,6 +7798,9 @@@ F:      drivers/tty/serial/serial_core.
  F:    include/linux/serial_core.h
  F:    include/linux/serial.h
  F:    include/linux/tty.h
 +F:    include/uapi/linux/serial_core.h
 +F:    include/uapi/linux/serial.h
 +F:    include/uapi/linux/tty.h
  
  TUA9001 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -7887,7 -7773,7 +7880,7 @@@ M:      David Herrmann <dh.herrmann@googlema
  L:    [email protected]
  S:    Maintained
  F:    drivers/hid/uhid.c
 -F:    include/linux/uhid.h
 +F:    include/uapi/linux/uhid.h
  
  ULTRA-WIDEBAND (UWB) SUBSYSTEM:
  L:    [email protected]
@@@ -7916,7 -7802,6 +7909,7 @@@ S:      Maintaine
  F:    Documentation/cdrom/
  F:    drivers/cdrom/cdrom.c
  F:    include/linux/cdrom.h
 +F:    include/uapi/linux/cdrom.h
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  M:    Vinayak Holikatti <[email protected]>
@@@ -7934,7 -7819,7 +7927,7 @@@ T:      git git://git.infradead.org/ubi-2.6.
  S:    Maintained
  F:    drivers/mtd/ubi/
  F:    include/linux/mtd/ubi.h
 -F:    include/mtd/ubi-user.h
 +F:    include/uapi/mtd/ubi-user.h
  
  UNSORTED BLOCK IMAGES (UBI) Fastmap
  M:    Richard Weinberger <[email protected]>
@@@ -7958,10 -7843,9 +7951,10 @@@ F:    drivers/net/wireless/ath/ar5523
  USB ATTACHED SCSI
  M:    Matthew Wilcox <[email protected]>
  M:    Sarah Sharp <[email protected]>
 +M:    Gerd Hoffmann <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/usb/storage/uas.c
  
  USB CDC ETHERNET DRIVER
@@@ -7969,7 -7853,7 +7962,7 @@@ M:      Oliver Neukum <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/usb/cdc_*.c
 -F:    include/linux/usb/cdc.h
 +F:    include/uapi/linux/usb/cdc.h
  
  USB CYPRESS C67X00 DRIVER
  M:    Peter Korsgaard <[email protected]>
@@@ -8290,7 -8174,6 +8283,7 @@@ S:      Maintaine
  F:    Documentation/vfio.txt
  F:    drivers/vfio/
  F:    include/linux/vfio.h
 +F:    include/uapi/linux/vfio.h
  
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <[email protected]>
@@@ -8307,7 -8190,6 +8300,7 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/char/virtio_console.c
  F:    include/linux/virtio_console.h
 +F:    include/uapi/linux/virtio_console.h
  
  VIRTIO CORE, NET AND BLOCK DRIVERS
  M:    Rusty Russell <[email protected]>
@@@ -8326,7 -8208,7 +8319,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/vhost/
 -F:    include/linux/vhost.h
 +F:    include/uapi/linux/vhost.h
  
  VIA RHINE NETWORK DRIVER
  M:    Roger Luethi <[email protected]>
@@@ -8466,7 -8348,6 +8459,7 @@@ S:      Maintaine
  F:    Documentation/watchdog/
  F:    drivers/watchdog/
  F:    include/linux/watchdog.h
 +F:    include/uapi/linux/watchdog.h
  
  WD7000 SCSI DRIVER
  M:    Miroslav Zagorac <[email protected]>
@@@ -8492,9 -8373,9 +8485,9 @@@ L:      [email protected]
  S:    Supported
  W:    http://linuxwimax.org
  F:    Documentation/wimax/README.wimax
 -F:    include/linux/wimax.h
  F:    include/linux/wimax/debug.h
  F:    include/net/wimax.h
 +F:    include/uapi/linux/wimax.h
  F:    net/wimax/
  
  WISTRON LAPTOP BUTTON DRIVER
@@@ -8580,7 -8461,7 +8573,7 @@@ F:      Documentation/x86
  F:    arch/x86/
  
  X86 PLATFORM DRIVERS
 -M:    Matthew Garrett <mjg@redhat.com>
 +M:    Matthew Garrett <matthew.garrett@nebula.com>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
  S:    Maintained
@@@ -8612,7 -8493,6 +8605,7 @@@ F:      drivers/*/xen-*front.
  F:    drivers/xen/
  F:    arch/x86/include/asm/xen/
  F:    include/xen/
 +F:    include/uapi/xen/
  
  XEN HYPERVISOR ARM
  M:    Stefano Stabellini <[email protected]>

diff --combined arch/ia64/Kconfig
index c1b80fb6938d3e9551b672d3ab7ec1382549defb,5fb10644d9ed85cfe28a7f05396f9feef0df398a..c90366ef718389521c0387405cb3c6f772c07afd
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -29,6 -29,7 +29,6 @@@ config IA6
        select ARCH_DISCARD_MEMBLOCK
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
 -      select IRQ_PER_CPU
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
@@@ -39,6 -40,7 +39,7 @@@
        select ARCH_THREAD_INFO_ALLOCATOR
        select ARCH_CLOCKSOURCE_DATA
        select GENERIC_TIME_VSYSCALL_OLD
+       select SYSCTL_ARCH_UNALIGN_NO_WARN
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        default y
@@@ -374,8 -376,8 +375,8 @@@ config NR_CPU
          performance hit.
  
  config HOTPLUG_CPU
 -      bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
 -      depends on SMP && EXPERIMENTAL
 +      bool "Support for hot-pluggable CPUs"
 +      depends on SMP
        select HOTPLUG
        default n
        ---help---
@@@ -554,8 -556,8 +555,8 @@@ config IA64_HP_AML_NF
  source "drivers/sn/Kconfig"
  
  config KEXEC
 -      bool "kexec system call (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
 +      bool "kexec system call"
 +      depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot

diff --combined init/Kconfig
index 335a1f680c918058e6ac4b12dadabd8f17294fb8,523bee15fb442377646420545a105bcc5ad11245..28c5b9dcc91e81bfba954bf0ebc26b476dc7b312
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -20,8 -20,12 +20,8 @@@ config CONSTRUCTOR
        bool
        depends on !UML
  
 -config HAVE_IRQ_WORK
 -      bool
 -
  config IRQ_WORK
        bool
 -      depends on HAVE_IRQ_WORK
  
  config BUILDTIME_EXTABLE_SORT
        bool
@@@ -29,8 -33,35 +29,8 @@@
  menu "General setup"
  
  config EXPERIMENTAL
 -      bool "Prompt for development and/or incomplete code/drivers"
 -      ---help---
 -        Some of the various things that Linux supports (such as network
 -        drivers, file systems, network protocols, etc.) can be in a state
 -        of development where the functionality, stability, or the level of
 -        testing is not yet high enough for general use. This is usually
 -        known as the "alpha-test" phase among developers. If a feature is
 -        currently in alpha-test, then the developers usually discourage
 -        uninformed widespread use of this feature by the general public to
 -        avoid "Why doesn't this work?" type mail messages. However, active
 -        testing and use of these systems is welcomed. Just be aware that it
 -        may not meet the normal level of reliability or it may fail to work
 -        in some special cases. Detailed bug reports from people familiar
 -        with the kernel internals are usually welcomed by the developers
 -        (before submitting bug reports, please read the documents
 -        <file:README>, <file:MAINTAINERS>, <file:REPORTING-BUGS>,
 -        <file:Documentation/BUG-HUNTING>, and
 -        <file:Documentation/oops-tracing.txt> in the kernel source).
 -
 -        This option will also make obsoleted drivers available. These are
 -        drivers that have been replaced by something else, and/or are
 -        scheduled to be removed in a future kernel release.
 -
 -        Unless you intend to help test and develop a feature or driver that
 -        falls into this category, or you have a situation that requires
 -        using these features, you should probably say N here, which will
 -        cause the configurator to present you with fewer choices. If
 -        you say Y here, you will be offered the choice of using features or
 -        drivers that are currently considered to be in the alpha-test phase.
 +      bool
 +      default y
  
  config BROKEN
        bool
@@@ -216,7 -247,7 +216,7 @@@ config SYSVIPC_SYSCT
  
  config POSIX_MQUEUE
        bool "POSIX Message Queues"
 -      depends on NET && EXPERIMENTAL
 +      depends on NET
        ---help---
          POSIX variant of message queues is a part of IPC. In POSIX message
          queues every message has a priority which decides about succession
@@@ -295,13 -326,10 +295,13 @@@ source "kernel/time/Kconfig
  
  menu "CPU/Task time and stats accounting"
  
 +config VIRT_CPU_ACCOUNTING
 +      bool
 +
  choice
        prompt "Cputime accounting"
        default TICK_CPU_ACCOUNTING if !PPC64
 -      default VIRT_CPU_ACCOUNTING if PPC64
 +      default VIRT_CPU_ACCOUNTING_NATIVE if PPC64
  
  # Kind of a stub config for the pure tick based cputime accounting
  config TICK_CPU_ACCOUNTING
@@@ -314,10 -342,9 +314,10 @@@
  
          If unsure, say Y.
  
 -config VIRT_CPU_ACCOUNTING
 +config VIRT_CPU_ACCOUNTING_NATIVE
        bool "Deterministic task and CPU time accounting"
        depends on HAVE_VIRT_CPU_ACCOUNTING
 +      select VIRT_CPU_ACCOUNTING
        help
          Select this option to enable more accurate task and CPU time
          accounting.  This is done by reading a CPU counter on each
@@@ -327,23 -354,6 +327,23 @@@
          this also enables accounting of stolen time on logically-partitioned
          systems.
  
 +config VIRT_CPU_ACCOUNTING_GEN
 +      bool "Full dynticks CPU time accounting"
 +      depends on HAVE_CONTEXT_TRACKING && 64BIT
 +      select VIRT_CPU_ACCOUNTING
 +      select CONTEXT_TRACKING
 +      help
 +        Select this option to enable task and CPU time accounting on full
 +        dynticks systems. This accounting is implemented by watching every
 +        kernel-user boundaries using the context tracking subsystem.
 +        The accounting is thus performed at the expense of some significant
 +        overhead.
 +
 +        For now this is only useful if you are working on the full
 +        dynticks subsystem development.
 +
 +        If unsure, say N.
 +
  config IRQ_TIME_ACCOUNTING
        bool "Fine granularity task level IRQ time accounting"
        depends on HAVE_IRQ_TIME_ACCOUNTING
@@@ -383,7 -393,7 +383,7 @@@ config BSD_PROCESS_ACCT_V
          at <http://www.gnu.org/software/acct/>.
  
  config TASKSTATS
 -      bool "Export task/process statistics through netlink (EXPERIMENTAL)"
 +      bool "Export task/process statistics through netlink"
        depends on NET
        default n
        help
@@@ -396,7 -406,7 +396,7 @@@
          Say N if unsure.
  
  config TASK_DELAY_ACCT
 -      bool "Enable per-task delay accounting (EXPERIMENTAL)"
 +      bool "Enable per-task delay accounting"
        depends on TASKSTATS
        help
          Collect information on time spent by a task waiting for system
@@@ -407,7 -417,7 +407,7 @@@
          Say N if unsure.
  
  config TASK_XACCT
 -      bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
 +      bool "Enable extended accounting over taskstats"
        depends on TASKSTATS
        help
          Collect extended task accounting data and send the data
@@@ -416,7 -426,7 +416,7 @@@
          Say N if unsure.
  
  config TASK_IO_ACCOUNTING
 -      bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
 +      bool "Enable per-task storage I/O accounting"
        depends on TASK_XACCT
        help
          Collect information on the number of bytes of storage I/O which this
@@@ -443,7 -453,7 +443,7 @@@ config TREE_RC
  
  config TREE_PREEMPT_RCU
        bool "Preemptible tree-based hierarchical RCU"
 -      depends on PREEMPT && SMP
 +      depends on PREEMPT
        help
          This option selects the RCU implementation that is
          designed for very large SMP systems with hundreds or
@@@ -451,8 -461,6 +451,8 @@@
          is also required.  It also scales down nicely to
          smaller systems.
  
 +        Select this option if you are unsure.
 +
  config TINY_RCU
        bool "UP-only small-memory-footprint RCU"
        depends on !PREEMPT && !SMP
@@@ -478,14 -486,6 +478,14 @@@ config PREEMPT_RC
          This option enables preemptible-RCU code that is common between
          the TREE_PREEMPT_RCU and TINY_PREEMPT_RCU implementations.
  
 +config RCU_STALL_COMMON
 +      def_bool ( TREE_RCU || TREE_PREEMPT_RCU || RCU_TRACE )
 +      help
 +        This option enables RCU CPU stall code that is common between
 +        the TINY and TREE variants of RCU.  The purpose is to allow
 +        the tiny variants to disable RCU CPU stall warnings, while
 +        making these warnings mandatory for the tree variants.
 +
  config CONTEXT_TRACKING
         bool
  
@@@ -880,8 -880,8 +880,8 @@@ config MEMCG_SWAP_ENABLE
          select this option (if, for some reason, they need to disable it
          then swapaccount=0 does the trick).
  config MEMCG_KMEM
 -      bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
 -      depends on MEMCG && EXPERIMENTAL
 +      bool "Memory Resource Controller Kernel Memory accounting"
 +      depends on MEMCG
        depends on SLUB || SLAB
        help
          The Kernel Memory extension for Memory Resource Controller can limit
@@@ -893,7 -893,7 +893,7 @@@
  
  config CGROUP_HUGETLB
        bool "HugeTLB Resource Controller for Control Groups"
 -      depends on RESOURCE_COUNTERS && HUGETLB_PAGE && EXPERIMENTAL
 +      depends on RESOURCE_COUNTERS && HUGETLB_PAGE
        default n
        help
          Provides a cgroup Resource Controller for HugeTLB pages.
@@@ -932,6 -932,7 +932,6 @@@ config FAIR_GROUP_SCHE
  
  config CFS_BANDWIDTH
        bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED"
 -      depends on EXPERIMENTAL
        depends on FAIR_GROUP_SCHED
        default n
        help
@@@ -943,6 -944,7 +943,6 @@@
  
  config RT_GROUP_SCHED
        bool "Group scheduling for SCHED_RR/FIFO"
 -      depends on EXPERIMENTAL
        depends on CGROUP_SCHED
        default n
        help
@@@ -1024,7 -1026,8 +1024,7 @@@ config IPC_N
          different IPC objects in different namespaces.
  
  config USER_NS
 -      bool "User namespace (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL
 +      bool "User namespace"
        depends on UIDGID_CONVERTED
        select UIDGID_STRICT_TYPE_CHECKS
  
@@@ -1179,7 -1182,7 +1179,7 @@@ config CC_OPTIMIZE_FOR_SIZ
          Enabling this option will pass "-Os" instead of "-O2" to gcc
          resulting in a smaller kernel.
  
 -        If unsure, say Y.
 +        If unsure, say N.
  
  config SYSCTL
        bool
@@@ -1229,6 -1232,13 +1229,13 @@@ config SYSCTL_EXCEPTION_TRAC
        help
          Enable support for /proc/sys/debug/exception-trace.
  
+ config SYSCTL_ARCH_UNALIGN_NO_WARN
+       bool
+       help
+         Enable support for /proc/sys/kernel/ignore-unaligned-usertrap
+         Allows arch to define/use @no_unaligned_warning to possibly warn
+         about unaligned access emulation going on under the hood.
+ 
  config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EXPERT
         default y
@@@ -1260,7 -1270,6 +1267,7 @@@ config HOTPLU
  config PRINTK
        default y
        bool "Enable support for printk" if EXPERT
 +      select IRQ_WORK
        help
          This option enables normal printk support. Removing it
          eliminates most of the message strings from the kernel image
@@@ -1606,7 -1615,7 +1613,7 @@@ config MODULE_UNLOA
  
  config MODULE_FORCE_UNLOAD
        bool "Forced module unloading"
 -      depends on MODULE_UNLOAD && EXPERIMENTAL
 +      depends on MODULE_UNLOAD
        help
          This option allows you to force a module to unload, even if the
          kernel believes it is unsafe: the kernel will remove the module

diff --combined kernel/sysctl.c
index 4fc9be955c712ca4b68c25b18d1ac9599df2a3ae,840fd5eb2309344e16248c8449af2b69b7edeb59..467d8b923fcdad7a55dce597e80dd39eab170230
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -61,7 -61,6 +61,7 @@@
  #include <linux/kmod.h>
  #include <linux/capability.h>
  #include <linux/binfmts.h>
 +#include <linux/sched/sysctl.h>
  
  #include <asm/uaccess.h>
  #include <asm/processor.h>
@@@ -162,10 -161,13 +162,13 @@@ extern int unaligned_enabled
  #endif
  
  #ifdef CONFIG_IA64
- extern int no_unaligned_warning;
  extern int unaligned_dump_stack;
  #endif
  
+ #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
+ extern int no_unaligned_warning;
+ #endif
+ 
  #ifdef CONFIG_PROC_SYSCTL
  static int proc_do_cad_pid(struct ctl_table *table, int write,
                  void __user *buffer, size_t *lenp, loff_t *ppos);
@@@ -404,13 -406,6 +407,13 @@@ static struct ctl_table kern_table[] = 
                .mode           = 0644,
                .proc_handler   = sched_rt_handler,
        },
 +      {
 +              .procname       = "sched_rr_timeslice_ms",
 +              .data           = &sched_rr_timeslice,
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              .proc_handler   = sched_rr_handler,
 +      },
  #ifdef CONFIG_SCHED_AUTOGROUP
        {
                .procname       = "sched_autogroup_enabled",
@@@ -919,7 -914,7 +922,7 @@@
                .proc_handler   = proc_doulongvec_minmax,
        },
  #endif
- #ifdef CONFIG_IA64
+ #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
        {
                .procname       = "ignore-unaligned-usertrap",
                .data           = &no_unaligned_warning,
@@@ -927,6 -922,8 +930,8 @@@
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
+ #endif
+ #ifdef CONFIG_IA64
        {
                .procname       = "unaligned-dump-stack",
                .data           = &unaligned_dump_stack,