Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull scheduler fixes from Ingo Molnar.

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpusets: Remove an unused variable
  sched/rt: Improve pick_next_highest_task_rt()
  sched: Fix select_fallback_rq() vs cpu_active/cpu_online
  sched/x86/smp: Do not enable IRQs over calibrate_delay()
  sched: Fix compiler warning about declared inline after use
  MAINTAINERS: Update email address for SCHEDULER and PERF EVENTS

diff --combined MAINTAINERS
index f9faade,1ad6a06..64168f6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -163,7 -163,7 +163,7 @@@ M: Greg Kroah-Hartman <gregkh@linuxfoun
  L:    linux-serial@vger.kernel.org
  W:    http://serial.sourceforge.net
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    drivers/tty/serial/8250*
  F:    include/linux/serial_8250.h
  
@@@ -464,7 -464,6 +464,7 @@@ ALPHA POR
  M:    Richard Henderson <rth@twiddle.net>
  M:    Ivan Kokshaysky <ink@jurassic.park.msu.ru>
  M:    Matt Turner <mattst88@gmail.com>
 +S:    Odd Fixes
  L:    linux-alpha@vger.kernel.org
  F:    arch/alpha/
  
@@@ -504,7 -503,7 +504,7 @@@ F: arch/x86/include/asm/geode.
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <joerg.roedel@amd.com>
  L:    iommu@lists.linux-foundation.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  S:    Supported
  F:    drivers/iommu/amd_iommu*.[ch]
  F:    include/linux/amd-iommu.h
@@@ -716,7 -715,6 +716,7 @@@ S: Maintaine
  ARM/CLKDEV SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
  F:    arch/arm/include/asm/clkdev.h
  F:    drivers/clk/clkdev.c
  
@@@ -786,6 -784,7 +786,6 @@@ M: Sascha Hauer <kernel@pengutronix.de
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
 -F:    arch/arm/mach-mx*/
  F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
  
@@@ -815,12 -814,9 +815,12 @@@ S:       Maintaine
  
  ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
  M:    Philipp Zabel <philipp.zabel@gmail.com>
 +M:    Paul Parsons <lost.distance@yahoo.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-pxa/hx4700.c
  F:    arch/arm/mach-pxa/include/mach/hx4700.h
 +F:    sound/soc/pxa/hx4700.c
  
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@@ -1409,7 -1405,7 +1409,7 @@@ F:      net/ax25
  B43 WIRELESS DRIVER
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
 -L:    b43-dev@lists.infradead.org (moderated for non-subscribers)
 +L:    b43-dev@lists.infradead.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43/
@@@ -1418,7 -1414,6 +1418,7 @@@ B43LEGACY WIRELESS DRIVE
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
 +L:    b43-dev@lists.infradead.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43legacy/
@@@ -1506,7 -1501,7 +1506,7 @@@ F:      drivers/i2c/busses/i2c-bfin-twi.
  
  BLOCK LAYER
  M:    Jens Axboe <axboe@kernel.dk>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
  
@@@ -1518,23 -1513,19 +1518,23 @@@ F:   drivers/mtd/devices/block2mtd.
  
  BLUETOOTH DRIVERS
  M:    Marcel Holtmann <marcel@holtmann.org>
 -M:    "Gustavo F. Padovan" <padovan@profusion.mobi>
 +M:    Gustavo Padovan <gustavo@padovan.org>
 +M:    Johan Hedberg <johan.hedberg@gmail.com>
  L:    linux-bluetooth@vger.kernel.org
  W:    http://www.bluez.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
  S:    Maintained
  F:    drivers/bluetooth/
  
  BLUETOOTH SUBSYSTEM
  M:    Marcel Holtmann <marcel@holtmann.org>
 -M:    "Gustavo F. Padovan" <padovan@profusion.mobi>
 +M:    Gustavo Padovan <gustavo@padovan.org>
 +M:    Johan Hedberg <johan.hedberg@gmail.com>
  L:    linux-bluetooth@vger.kernel.org
  W:    http://www.bluez.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
  S:    Maintained
  F:    net/bluetooth/
  F:    include/net/bluetooth/
@@@ -1576,6 -1567,7 +1576,6 @@@ F:      drivers/net/ethernet/broadcom/tg3.
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Brett Rudley <brudley@broadcom.com>
 -M:    Henry Ptasinski <henryp@broadcom.com>
  M:    Roland Vossen <rvossen@broadcom.com>
  M:    Arend van Spriel <arend@broadcom.com>
  M:    Franky (Zhenhui) Lin <frankyl@broadcom.com>
@@@ -1644,7 -1636,7 +1644,7 @@@ BTTV VIDEO4LINUX DRIVE
  M:    Mauro Carvalho Chehab <mchehab@infradead.org>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/bttv/
  F:    drivers/media/video/bt8xx/bttv*
@@@ -1674,7 -1666,7 +1674,7 @@@ F:      fs/cachefiles
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/cafe_ccic
  F:    drivers/media/video/marvell-ccic/
@@@ -1725,14 -1717,6 +1725,14 @@@ F:    include/linux/can/error.
  F:    include/linux/can/netlink.h
  F:    include/linux/can/platform/
  
 +CAPABILITIES
 +M:    Serge Hallyn <serge.hallyn@canonical.com>
 +L:    linux-security-module@vger.kernel.org
 +S:    Supported       
 +F:    include/linux/capability.h
 +F:    security/capability.c
 +F:    security/commoncap.c 
 +
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -1813,8 -1797,7 +1813,8 @@@ F:      Documentation/zh_CN
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Roopa Prabhu <roprabhu@cisco.com>
 -M:    David Wang <dwang2@cisco.com>
 +M:    Neel Patel <neepatel@cisco.com>
 +M:    Nishank Trivedi <nistrive@cisco.com>
  S:    Supported
  F:    drivers/net/ethernet/cisco/enic/
  
@@@ -1836,16 -1819,8 +1836,16 @@@ L:    alsa-devel@alsa-project.org (moderat
  S:    Supported
  F:    sound/soc/codecs/cs4270*
  
 +CLEANCACHE API
 +M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    mm/cleancache.c
 +F:    include/linux/cleancache.h
 +
  CLK API
  M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
  F:    include/linux/clk.h
  
  CISCO FCOE HBA DRIVER
@@@ -2041,7 -2016,7 +2041,7 @@@ CX18 VIDEO4LINUX DRIVE
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://linuxtv.org
  W:    http://www.ivtvdriver.org/index.php/Cx18
  S:    Maintained
@@@ -2114,13 -2089,6 +2114,13 @@@ W:    http://www.cyclades.com
  S:    Orphan
  F:    drivers/net/wan/pc300*
  
 +CYTTSP TOUCHSCREEN DRIVER
 +M:      Javier Martinez Canillas <javier@dowhile0.org>
 +L:      linux-input@vger.kernel.org
 +S:      Maintained
 +F:      drivers/input/touchscreen/cyttsp*
 +F:      include/linux/input/cyttsp.h
 +
  DAMA SLAVE for AX.25
  M:    Joerg Reuter <jreuter@yaina.de>
  W:    http://yaina.de/jreuter/
@@@ -2225,16 -2193,13 +2225,16 @@@ W:   http://lanana.org/docs/device-list/i
  S:    Maintained
  
  DEVICE-MAPPER  (LVM)
 -P:    Alasdair Kergon
 +M:    Alasdair Kergon <agk@redhat.com>
 +M:    dm-devel@redhat.com
  L:    dm-devel@redhat.com
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
 +T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  S:    Maintained
  F:    Documentation/device-mapper/
  F:    drivers/md/dm*
 +F:    drivers/md/persistent-data/
  F:    include/linux/device-mapper.h
  F:    include/linux/dm-*.h
  
@@@ -2265,15 -2230,6 +2265,15 @@@ F:    Documentation/filesystems/quota.tx
  F:    fs/quota/
  F:    include/linux/quota*.h
  
 +DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB)
 +M:    Bernie Thompson <bernie@plugable.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +W:    http://plugable.com/category/projects/udlfb/
 +F:    drivers/video/udlfb.c
 +F:    include/video/udlfb.h
 +F:    Documentation/fb/udlfb.txt
 +
  DISTRIBUTED LOCK MANAGER (DLM)
  M:    Christine Caulfield <ccaulfie@redhat.com>
  M:    David Teigland <teigland@redhat.com>
@@@ -2358,7 -2314,7 +2358,7 @@@ F:      Documentation/blockdev/drbd
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
  F:    Documentation/kobject.txt
  F:    drivers/base/
@@@ -2380,7 -2336,7 +2380,7 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Keith Packard <keithp@keithp.com>
  L:    intel-gfx@lists.freedesktop.org (subscribers-only)
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2675,21 -2631,6 +2675,21 @@@ M:    Mimi Zohar <zohar@us.ibm.com
  S:    Supported
  F:    security/integrity/evm/
  
 +EXYNOS DP DRIVER
 +M:    Jingoo Han <jg1.han@samsung.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/exynos/exynos_dp*
 +
 +EXYNOS MIPI DISPLAY DRIVERS
 +M:    Inki Dae <inki.dae@samsung.com>
 +M:    Donghwa Lee <dh09.lee@samsung.com>
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/exynos/exynos_mipi*
 +F:    include/video/exynos_mipi*
 +
  F71805F HARDWARE MONITORING DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -2904,12 -2845,6 +2904,12 @@@ S:    Maintaine
  F:    drivers/media/video/m5mols/
  F:    include/media/m5mols.h
  
 +FUJITSU TABLET EXTRAS
 +M:    Robert Gerlach <khnz@gmx.de>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/fujitsu-tablet.c
 +
  FUSE: FILESYSTEM IN USERSPACE
  M:    Miklos Szeredi <miklos@szeredi.hu>
  L:    fuse-devel@lists.sourceforge.net
@@@ -2974,8 -2909,8 +2974,8 @@@ GFS2 FILE SYSTE
  M:    Steven Whitehouse <swhiteho@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git
  S:    Supported
  F:    Documentation/filesystems/gfs2*.txt
  F:    fs/gfs2/
@@@ -3016,42 -2951,42 +3016,42 @@@ F:   drivers/net/ethernet/aeroflex
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <frank@zago.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/finepix.c
  
  GSPCA GL860 SUBDRIVER
  M:    Olivier Lorin <o.lorin@laposte.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/gl860/
  
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <erik.andren@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/m5602/
  
  GSPCA PAC207 SONIXB SUBDRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
  M:    Brian Johnson <brijohn@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/sn9c20x.c
  
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <lcostantino@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/t613.c
  
@@@ -3059,7 -2994,7 +3059,7 @@@ GSPCA USB WEBCAM DRIVE
  M:    Jean-Francois Moine <moinejf@free.fr>
  W:    http://moinejf.free.fr
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/
  
@@@ -3345,7 -3280,7 +3345,7 @@@ IDE SUBSYSTE
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git
  S:    Maintained
  F:    Documentation/ide/
  F:    drivers/ide/
@@@ -3457,7 -3392,7 +3457,7 @@@ F:      firmware/isci
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
  S:    Supported
  F:    drivers/idle/intel_idle.c
  
@@@ -3703,15 -3638,6 +3703,15 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
  
 +IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 +M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 +M:    Grant Likely <grant.likely@secretlab.ca>
 +T:    git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
 +S:    Maintained
 +F:    Documentation/IRQ-domain.txt
 +F:    include/linux/irqdomain.h
 +F:    kernel/irq/irqdomain.c
 +
  ISAPNP
  M:    Jaroslav Kysela <perex@perex.cz>
  S:    Maintained
@@@ -3764,7 -3690,7 +3764,7 @@@ IVTV VIDEO4LINUX DRIVE
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ivtvdriver.org
  S:    Maintained
  F:    Documentation/video4linux/*.ivtv
@@@ -3860,8 -3786,8 +3860,8 @@@ F:      fs/autofs4
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Michal Marek <mmarek@suse.cz>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git for-next
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git for-next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
  F:    Documentation/kbuild/
@@@ -4108,7 -4034,7 +4108,7 @@@ M:      Josh Boyer <jwboyer@gmail.com
  M:    Matt Porter <mporter@kernel.crashing.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
 -T:    git git://git.infradead.org/users/jwboyer/powerpc-4xx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
  S:    Maintained
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
@@@ -4241,14 -4167,12 +4241,14 @@@ F:   Documentation/hwmon/ltc426
  F:    drivers/hwmon/ltc4261.c
  
  LTP (Linux Test Project)
 -M:    Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
 -M:    Garrett Cooper <yanegomi@gmail.com>
 +M:    Shubham Goyal <shubham@linux.vnet.ibm.com>
  M:    Mike Frysinger <vapier@gentoo.org>
 -M:    Subrata Modak <subrata@linux.vnet.ibm.com>
 +M:    Cyril Hrubis <chrubis@suse.cz>
 +M:    Caspar Zhang <caspar@casparzhang.com>
 +M:    Wanlong Gao <gaowanlong@cn.fujitsu.com>
  L:    ltp-list@lists.sourceforge.net (subscribers-only)
  W:    http://ltp.sourceforge.net/
 +T:    git git://github.com/linux-test-project/ltp.git
  T:    git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
  S:    Maintained
  
@@@ -4286,7 -4210,7 +4286,7 @@@ MAC8021
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    Documentation/networking/mac80211-injection.txt
  F:    include/net/mac80211.h
@@@ -4297,7 -4221,7 +4297,7 @@@ M:      Stefano Brivio <stefano.brivio@polim
  M:    Mattias Nissler <mattias.nissler@gmx.de>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    net/mac80211/rc80211_pid*
  
@@@ -4369,7 -4293,7 +4369,7 @@@ P:      LinuxTV.org Projec
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/dvb/
  F:    Documentation/video4linux/
@@@ -4426,13 -4350,6 +4426,13 @@@ T:    git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 +MICROCHANNEL ARCHITECTURE (MCA)
 +M:    James Bottomley <James.Bottomley@HansenPartnership.com>
 +S:    Maintained
 +F:    Documentation/mca.txt
 +F:    drivers/mca/
 +F:    include/linux/mca*
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <oliver@neukum.name>
  S:    Maintained
@@@ -4448,6 -4365,14 +4448,6 @@@ S:     Supporte
  F:    Documentation/mips/
  F:    arch/mips/
  
 -MISCELLANEOUS MCA-SUPPORT
 -M:    James Bottomley <James.Bottomley@HansenPartnership.com>
 -S:    Maintained
 -F:    Documentation/ia64/mca.txt
 -F:    Documentation/mca.txt
 -F:    drivers/mca/
 -F:    include/linux/mca*
 -
  MODULE SUPPORT
  M:    Rusty Russell <rusty@rustcorp.com.au>
  S:    Maintained
@@@ -4655,7 -4580,7 +4655,7 @@@ M:      James Morris <jmorris@namei.org
  M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
  M:    Patrick McHardy <kaber@trash.net>
  L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
  S:    Maintained
  F:    net/ipv4/
  F:    net/ipv6/
@@@ -4671,7 -4596,7 +4671,7 @@@ NETWORKING [WIRELESS
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    net/mac80211/
  F:    net/rfkill/
@@@ -4684,8 -4609,8 +4684,8 @@@ F:      drivers/net/wireless
  NETWORKING DRIVERS
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
  S:    Odd Fixes
  F:    drivers/net/
  F:    include/linux/if_*
@@@ -4901,7 -4826,7 +4901,7 @@@ F:      drivers/char/pcmcia/cm4040_cs.
  OMNIVISION OV7670 SENSOR DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/ov7670.c
  
@@@ -4985,6 -4910,8 +4985,6 @@@ F:      fs/ocfs2
  
  ORINOCO DRIVER
  L:    linux-wireless@vger.kernel.org
 -L:    orinoco-users@lists.sourceforge.net
 -L:    orinoco-devel@lists.sourceforge.net
  W:    http://linuxwireless.org/en/users/Drivers/orinoco
  W:    http://www.nongnu.org/orinoco/
  S:    Orphan
@@@ -5076,7 -5003,7 +5076,7 @@@ M:      Helge Deller <deller@gmx.de
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
  S:    Maintained
  F:    arch/parisc/
  F:    drivers/parisc/
@@@ -5129,17 -5056,17 +5129,17 @@@ F:   Documentation/PCI/pci-error-recovery
  F:    Documentation/powerpc/eeh-pci-error-recovery.txt
  
  PCI SUBSYSTEM
 -M:    Jesse Barnes <jbarnes@virtuousgeek.org>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-pci/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci.git
  S:    Supported
  F:    Documentation/PCI/
  F:    drivers/pci/
  F:    include/linux/pci*
  
  PCI HOTPLUG
 -M:    Jesse Barnes <jbarnes@virtuousgeek.org>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    drivers/pci/hotplug
@@@ -5185,7 -5112,7 +5185,7 @@@ F:      kernel/delayacct.
  PERFORMANCE EVENTS SUBSYSTEM
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
- M:    Ingo Molnar <mingo@elte.hu>
+ M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
@@@ -5391,17 -5318,6 +5391,17 @@@ L:    cbe-oss-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 +PTP HARDWARE CLOCK SUPPORT
 +M:    Richard Cochran <richardcochran@gmail.com>
 +S:    Maintained
 +W:    http://linuxptp.sourceforge.net/
 +F:    Documentation/ABI/testing/sysfs-ptp
 +F:    Documentation/ptp/*
 +F:    drivers/net/gianfar_ptp.c
 +F:    drivers/net/phy/dp83640*
 +F:    drivers/ptp/*
 +F:    include/linux/ptp_cl*
 +
  PTRACE SUPPORT
  M:    Roland McGrath <roland@redhat.com>
  M:    Oleg Nesterov <oleg@redhat.com>
@@@ -5417,7 -5333,7 +5417,7 @@@ M:      Mike Isely <isely@pobox.com
  L:    pvrusb2@isely.net       (subscribers-only)
  L:    linux-media@vger.kernel.org
  W:    http://www.isely.net/pvrusb2/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/README.pvrusb2
  F:    drivers/media/video/pvrusb2/
@@@ -5425,7 -5341,7 +5425,7 @@@
  PXA2xx/PXA3xx SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
  M:    Russell King <linux@arm.linux.org.uk>
 -M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Haojian Zhuang <haojian.zhuang@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
@@@ -5440,7 -5356,7 +5440,7 @@@ F:      sound/soc/px
  
  MMP SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
 -M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Haojian Zhuang <haojian.zhuang@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
@@@ -5583,7 -5499,7 +5583,7 @@@ RCUTORTURE MODUL
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
  
@@@ -5608,7 -5524,7 +5608,7 @@@ M:      Dipankar Sarma <dipankar@in.ibm.com
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  W:    http://www.rdrop.com/users/paulmck/rclock/
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    include/linux/srcu*
@@@ -5637,13 -5553,6 +5637,13 @@@ S:    Supporte
  F:    drivers/base/regmap/
  F:    include/linux/regmap.h
  
 +REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 +M:    Ohad Ben-Cohen <ohad@wizery.com>
 +S:    Maintained
 +F:    drivers/remoteproc/
 +F:    Documentation/remoteproc.txt
 +F:    include/linux/remoteproc.txt
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -5769,19 -5678,13 +5769,19 @@@ F:   drivers/mmc/host/s3cmci.
  SAA7146 VIDEO4LINUX-2 DRIVER
  M:    Michael Hunold <michael@mihu.de>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  F:    drivers/media/common/saa7146*
  F:    drivers/media/video/*7146*
  F:    include/media/*7146*
  
 +SAMSUNG LAPTOP DRIVER
 +M:    Corentin Chary <corentincj@iksaif.net>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/samsung-laptop.c
 +
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Sangbeom Kim <sbkim73@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -5833,7 -5736,7 +5833,7 @@@ S:      Maintaine
  F:    drivers/watchdog/sc1200wdt.c
  
  SCHEDULER
- M:    Ingo Molnar <mingo@elte.hu>
+ M:    Ingo Molnar <mingo@redhat.com>
  M:    Peter Zijlstra <peterz@infradead.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
  S:    Maintained
@@@ -5950,7 -5853,6 +5950,7 @@@ F:      drivers/mmc/host/sdhci-s3c.
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
  M:    Viresh Kumar <viresh.kumar@st.com>
 +L:    spear-devel@list.st.com
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/sdhci-spear.c
@@@ -6080,8 -5982,7 +6080,8 @@@ F:      arch/arm/mach-s3c2410/bast-irq.
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
  M:    Kevin Hilman <khilman@ti.com>
 -L:    davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 +L:    davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
 +T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
@@@ -6199,7 -6100,7 +6199,7 @@@ F:      arch/ia64/sn
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    include/media/v4l2*
  F:    drivers/media/video/v4l2*
@@@ -6271,8 -6172,8 +6271,8 @@@ SPARC + UltraSPARC (sparc/sparc64
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
  S:    Maintained
  F:    arch/sparc/
  F:    drivers/sbus/
@@@ -6280,11 -6181,11 +6280,11 @@@
  SPARC SERIAL DRIVERS
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
  S:    Maintained
 +F:    include/linux/sunserialcore.h
  F:    drivers/tty/serial/suncore.c
 -F:    drivers/tty/serial/suncore.h
  F:    drivers/tty/serial/sunhv.c
  F:    drivers/tty/serial/sunsab.c
  F:    drivers/tty/serial/sunsab.h
@@@ -6294,32 -6195,24 +6294,32 @@@ F:   drivers/tty/serial/sunzilog.
  
  SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <viresh.kumar@st.com>
 +L:    spear-devel@list.st.com
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
  F:    arch/arm/plat-spear/
  
  SPEAR3XX MACHINE SUPPORT
  M:    Viresh Kumar <viresh.kumar@st.com>
 +L:    spear-devel@list.st.com
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
  F:    arch/arm/mach-spear3xx/
  
  SPEAR6XX MACHINE SUPPORT
  M:    Rajeev Kumar <rajeev-dlh.kumar@st.com>
 +L:    spear-devel@list.st.com
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
  F:    arch/arm/mach-spear6xx/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
  M:    Viresh Kumar <viresh.kumar@st.com>
 +L:    spear-devel@list.st.com
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
  F:    arch/arm/mach-spear*/clock.c
@@@ -6328,8 -6221,6 +6328,8 @@@ F:      arch/arm/plat-spear/include/plat/clo
  
  SPEAR PAD MULTIPLEXING SUPPORT
  M:    Viresh Kumar <viresh.kumar@st.com>
 +L:    spear-devel@list.st.com
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
  F:    arch/arm/plat-spear/include/plat/padmux.h
@@@ -6466,11 -6357,6 +6466,11 @@@ W:    http://wiki.laptop.org/go/DCO
  S:    Odd Fixes
  F:    drivers/staging/olpc_dcon/
  
 +STAGING - OZMO DEVICES USB OVER WIFI DRIVER
 +M:    Chris Kelly <ckelly@ozmodevices.com>
 +S:    Maintained
 +F:    drivers/staging/ozwpan/
 +
  STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
  M:    Willy Tarreau <willy@meta-x.org>
  S:    Odd Fixes
@@@ -6586,7 -6472,7 +6586,7 @@@ L:      linux-scsi@vger.kernel.or
  L:    target-devel@vger.kernel.org
  L:    http://groups.google.com/group/linux-iscsi-target-dev
  W:    http://www.linux-iscsi.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core.git master
  S:    Supported
  F:    drivers/target/
  F:    include/target/
@@@ -6624,10 -6510,9 +6624,10 @@@ F:    include/linux/if_team.
  TEGRA SUPPORT
  M:    Colin Cross <ccross@android.com>
  M:    Olof Johansson <olof@lixom.net>
 -M:    Stephen Warren <swarren@nvidia.com>
 +M:    Stephen Warren <swarren@wwwdotorg.org>
  L:    linux-tegra@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
 +Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra
  
@@@ -6778,7 -6663,7 +6778,7 @@@ K:      ^Subject:.*(?i)trivia
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -6946,7 -6831,7 +6946,7 @@@ USB ET61X[12]51 DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    drivers/media/video/et61x251/
@@@ -7102,7 -6987,7 +7102,7 @@@ USB SN9C1xx DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/sn9c102.txt
@@@ -7112,7 -6997,7 +7112,7 @@@ USB SUBSYSTE
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
  S:    Supported
  F:    Documentation/usb/
  F:    drivers/net/usb/
@@@ -7138,7 -7023,7 +7138,7 @@@ USB VIDEO CLAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-uvc-devel@lists.berlios.de (subscribers-only)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ideasonboard.org/uvc/
  S:    Maintained
  F:    drivers/media/video/uvc/
@@@ -7147,7 -7032,7 +7147,7 @@@ USB W996[87]CF DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/w9968cf.txt
@@@ -7176,7 -7061,7 +7176,7 @@@ USB ZR364XX DRIVE
  M:    Antoine Jacquet <royale@zerezo.com>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  F:    Documentation/video4linux/zr364xx.txt
@@@ -7326,7 -7211,7 +7326,7 @@@ M:      Liam Girdwood <lrg@ti.com
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
  S:    Supported
  F:    drivers/regulator/
  F:    include/linux/regulator/
@@@ -7573,12 -7458,6 +7573,12 @@@ S:    Supporte
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/
  
 +XILINX AXI ETHERNET DRIVER
 +M:    Ariane Keller <ariane.keller@tik.ee.ethz.ch>
 +M:    Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
 +S:    Maintained
 +F:    drivers/net/ethernet/xilinx/xilinx_axienet*
 +
  XILINX SYSTEMACE DRIVER
  M:    Grant Likely <grant.likely@secretlab.ca>
  W:    http://www.secretlab.ca/

diff --combined arch/x86/kernel/smpboot.c
index 5104a2b,89571a0..ce13315
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -219,14 -219,9 +219,9 @@@ static void __cpuinit smp_callin(void
         * Update loops_per_jiffy in cpu_data. Previous call to
         * smp_store_cpu_info() stored a value that is close but not as
         * accurate as the value just calculated.
-        *
-        * Need to enable IRQs because it can take longer and then
-        * the NMI watchdog might kill us.
         */
-       local_irq_enable();
        calibrate_delay();
        cpu_data(cpuid).loops_per_jiffy = loops_per_jiffy;
-       local_irq_disable();
        pr_debug("Stack at about %p\n", &cpuid);
  
        /*
@@@ -255,7 -250,6 +250,7 @@@ notrace static void __cpuinit start_sec
         * most necessary things.
         */
        cpu_init();
 +      x86_cpuinit.early_percpu_clock_init();
        preempt_disable();
        smp_callin();
  
@@@ -728,6 -722,8 +723,6 @@@ do_rest
         * the targeted processor.
         */
  
 -      printk(KERN_DEBUG "smpboot cpu %d: start_ip = %lx\n", cpu, start_ip);
 -
        atomic_set(&init_deasserted, 0);
  
        if (get_uv_system_type() != UV_NON_UNIQUE_APIC) {
@@@ -777,10 -773,9 +772,10 @@@
                        schedule();
                }
  
 -              if (cpumask_test_cpu(cpu, cpu_callin_mask))
 +              if (cpumask_test_cpu(cpu, cpu_callin_mask)) {
 +                      print_cpu_msr(&cpu_data(cpu));
                        pr_debug("CPU%d: has booted.\n", cpu);
 -              else {
 +              } else {
                        boot_error = 1;
                        if (*(volatile u32 *)TRAMPOLINE_SYM(trampoline_status)
                            == 0xA5A5A5A5)
@@@ -834,7 -829,7 +829,7 @@@ int __cpuinit native_cpu_up(unsigned in
  
        if (apicid == BAD_APICID || apicid == boot_cpu_physical_apicid ||
            !physid_isset(apicid, phys_cpu_present_map) ||
 -          (!x2apic_mode && apicid >= 255)) {
 +          !apic->apic_id_valid(apicid)) {
                printk(KERN_ERR "%s: bad cpu %d\n", __func__, cpu);
                return -EINVAL;
        }

diff --combined include/linux/cpuset.h
index 7a7e5fd,e0ffaf0..668f66b
--- 1/include/linux/cpuset.h
--- 2/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@@ -22,7 -22,7 +22,7 @@@ extern int cpuset_init(void)
  extern void cpuset_init_smp(void);
  extern void cpuset_update_active_cpus(void);
  extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);
- extern int cpuset_cpus_allowed_fallback(struct task_struct *p);
+ extern void cpuset_cpus_allowed_fallback(struct task_struct *p);
  extern nodemask_t cpuset_mems_allowed(struct task_struct *p);
  #define cpuset_current_mems_allowed (current->mems_allowed)
  void cpuset_init_current_mems_allowed(void);
@@@ -89,33 -89,42 +89,33 @@@ extern void rebuild_sched_domains(void)
  extern void cpuset_print_task_mems_allowed(struct task_struct *p);
  
  /*
 - * reading current mems_allowed and mempolicy in the fastpath must protected
 - * by get_mems_allowed()
 + * get_mems_allowed is required when making decisions involving mems_allowed
 + * such as during page allocation. mems_allowed can be updated in parallel
 + * and depending on the new value an operation can fail potentially causing
 + * process failure. A retry loop with get_mems_allowed and put_mems_allowed
 + * prevents these artificial failures.
   */
 -static inline void get_mems_allowed(void)
 +static inline unsigned int get_mems_allowed(void)
  {
 -      current->mems_allowed_change_disable++;
 -
 -      /*
 -       * ensure that reading mems_allowed and mempolicy happens after the
 -       * update of ->mems_allowed_change_disable.
 -       *
 -       * the write-side task finds ->mems_allowed_change_disable is not 0,
 -       * and knows the read-side task is reading mems_allowed or mempolicy,
 -       * so it will clear old bits lazily.
 -       */
 -      smp_mb();
 +      return read_seqcount_begin(&current->mems_allowed_seq);
  }
  
 -static inline void put_mems_allowed(void)
 +/*
 + * If this returns false, the operation that took place after get_mems_allowed
 + * may have failed. It is up to the caller to retry the operation if
 + * appropriate.
 + */
 +static inline bool put_mems_allowed(unsigned int seq)
  {
 -      /*
 -       * ensure that reading mems_allowed and mempolicy before reducing
 -       * mems_allowed_change_disable.
 -       *
 -       * the write-side task will know that the read-side task is still
 -       * reading mems_allowed or mempolicy, don't clears old bits in the
 -       * nodemask.
 -       */
 -      smp_mb();
 -      --ACCESS_ONCE(current->mems_allowed_change_disable);
 +      return !read_seqcount_retry(&current->mems_allowed_seq, seq);
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
  {
        task_lock(current);
 +      write_seqcount_begin(&current->mems_allowed_seq);
        current->mems_allowed = nodemask;
 +      write_seqcount_end(&current->mems_allowed_seq);
        task_unlock(current);
  }
  
@@@ -135,10 -144,8 +135,8 @@@ static inline void cpuset_cpus_allowed(
        cpumask_copy(mask, cpu_possible_mask);
  }
  
- static inline int cpuset_cpus_allowed_fallback(struct task_struct *p)
+ static inline void cpuset_cpus_allowed_fallback(struct task_struct *p)
  {
-       do_set_cpus_allowed(p, cpu_possible_mask);
-       return cpumask_any(cpu_active_mask);
  }
  
  static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)
@@@ -225,14 -232,12 +223,14 @@@ static inline void set_mems_allowed(nod
  {
  }
  
 -static inline void get_mems_allowed(void)
 +static inline unsigned int get_mems_allowed(void)
  {
 +      return 0;
  }
  
 -static inline void put_mems_allowed(void)
 +static inline bool put_mems_allowed(unsigned int seq)
  {
 +      return true;
  }
  
  #endif /* !CONFIG_CPUSETS */

diff --combined kernel/cpuset.c
index 1010cc6,4ef4d7e..b96ad75
--- 1/kernel/cpuset.c
--- 2/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@@ -964,6 -964,7 +964,6 @@@ static void cpuset_change_task_nodemask
  {
        bool need_loop;
  
 -repeat:
        /*
         * Allow tasks that have access to memory reserves because they have
         * been OOM killed to get memory anywhere.
@@@ -982,19 -983,45 +982,19 @@@
         */
        need_loop = task_has_mempolicy(tsk) ||
                        !nodes_intersects(*newmems, tsk->mems_allowed);
 -      nodes_or(tsk->mems_allowed, tsk->mems_allowed, *newmems);
 -      mpol_rebind_task(tsk, newmems, MPOL_REBIND_STEP1);
  
 -      /*
 -       * ensure checking ->mems_allowed_change_disable after setting all new
 -       * allowed nodes.
 -       *
 -       * the read-side task can see an nodemask with new allowed nodes and
 -       * old allowed nodes. and if it allocates page when cpuset clears newly
 -       * disallowed ones continuous, it can see the new allowed bits.
 -       *
 -       * And if setting all new allowed nodes is after the checking, setting
 -       * all new allowed nodes and clearing newly disallowed ones will be done
 -       * continuous, and the read-side task may find no node to alloc page.
 -       */
 -      smp_mb();
 -
 -      /*
 -       * Allocation of memory is very fast, we needn't sleep when waiting
 -       * for the read-side.
 -       */
 -      while (need_loop && ACCESS_ONCE(tsk->mems_allowed_change_disable)) {
 -              task_unlock(tsk);
 -              if (!task_curr(tsk))
 -                      yield();
 -              goto repeat;
 -      }
 +      if (need_loop)
 +              write_seqcount_begin(&tsk->mems_allowed_seq);
  
 -      /*
 -       * ensure checking ->mems_allowed_change_disable before clearing all new
 -       * disallowed nodes.
 -       *
 -       * if clearing newly disallowed bits before the checking, the read-side
 -       * task may find no node to alloc page.
 -       */
 -      smp_mb();
 +      nodes_or(tsk->mems_allowed, tsk->mems_allowed, *newmems);
 +      mpol_rebind_task(tsk, newmems, MPOL_REBIND_STEP1);
  
        mpol_rebind_task(tsk, newmems, MPOL_REBIND_STEP2);
        tsk->mems_allowed = *newmems;
 +
 +      if (need_loop)
 +              write_seqcount_end(&tsk->mems_allowed_seq);
 +
        task_unlock(tsk);
  }
  
@@@ -1372,7 -1399,8 +1372,7 @@@ static nodemask_t cpuset_attach_nodemas
  static nodemask_t cpuset_attach_nodemask_to;
  
  /* Called by cgroups to determine if a cpuset is usable; cgroup_mutex held */
 -static int cpuset_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
 -                           struct cgroup_taskset *tset)
 +static int cpuset_can_attach(struct cgroup *cgrp, struct cgroup_taskset *tset)
  {
        struct cpuset *cs = cgroup_cs(cgrp);
        struct task_struct *task;
@@@ -1408,7 -1436,8 +1408,7 @@@
        return 0;
  }
  
 -static void cpuset_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
 -                        struct cgroup_taskset *tset)
 +static void cpuset_attach(struct cgroup *cgrp, struct cgroup_taskset *tset)
  {
        struct mm_struct *mm;
        struct task_struct *task;
@@@ -1804,7 -1833,8 +1804,7 @@@ static int cpuset_populate(struct cgrou
   * (and likewise for mems) to the new cgroup. Called with cgroup_mutex
   * held.
   */
 -static void cpuset_post_clone(struct cgroup_subsys *ss,
 -                            struct cgroup *cgroup)
 +static void cpuset_post_clone(struct cgroup *cgroup)
  {
        struct cgroup *parent, *child;
        struct cpuset *cs, *parent_cs;
@@@ -1827,10 -1857,13 +1827,10 @@@
  
  /*
   *    cpuset_create - create a cpuset
 - *    ss:     cpuset cgroup subsystem
   *    cont:   control group that the new cpuset will be part of
   */
  
 -static struct cgroup_subsys_state *cpuset_create(
 -      struct cgroup_subsys *ss,
 -      struct cgroup *cont)
 +static struct cgroup_subsys_state *cpuset_create(struct cgroup *cont)
  {
        struct cpuset *cs;
        struct cpuset *parent;
@@@ -1869,7 -1902,7 +1869,7 @@@
   * will call async_rebuild_sched_domains().
   */
  
 -static void cpuset_destroy(struct cgroup_subsys *ss, struct cgroup *cont)
 +static void cpuset_destroy(struct cgroup *cont)
  {
        struct cpuset *cs = cgroup_cs(cont);
  
@@@ -2162,10 -2195,9 +2162,9 @@@ void cpuset_cpus_allowed(struct task_st
        mutex_unlock(&callback_mutex);
  }
  
- int cpuset_cpus_allowed_fallback(struct task_struct *tsk)
+ void cpuset_cpus_allowed_fallback(struct task_struct *tsk)
  {
        const struct cpuset *cs;
-       int cpu;
  
        rcu_read_lock();
        cs = task_cs(tsk);
@@@ -2186,22 -2218,10 +2185,10 @@@
         * changes in tsk_cs()->cpus_allowed. Otherwise we can temporary
         * set any mask even if it is not right from task_cs() pov,
         * the pending set_cpus_allowed_ptr() will fix things.
+        *
+        * select_fallback_rq() will fix things ups and set cpu_possible_mask
+        * if required.
         */
- 
-       cpu = cpumask_any_and(&tsk->cpus_allowed, cpu_active_mask);
-       if (cpu >= nr_cpu_ids) {
-               /*
-                * Either tsk->cpus_allowed is wrong (see above) or it
-                * is actually empty. The latter case is only possible
-                * if we are racing with remove_tasks_in_empty_cpuset().
-                * Like above we can temporary set any mask and rely on
-                * set_cpus_allowed_ptr() as synchronization point.
-                */
-               do_set_cpus_allowed(tsk, cpu_possible_mask);
-               cpu = cpumask_any(cpu_active_mask);
-       }
- 
-       return cpu;
  }
  
  void cpuset_init_current_mems_allowed(void)

diff --combined kernel/sched/core.c
index 157fb9b,9c1629c..e3ed0ec
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -71,9 -71,7 +71,9 @@@
  #include <linux/ftrace.h>
  #include <linux/slab.h>
  #include <linux/init_task.h>
 +#include <linux/binfmts.h>
  
 +#include <asm/switch_to.h>
  #include <asm/tlb.h>
  #include <asm/irq_regs.h>
  #include <asm/mutex.h>
@@@ -164,13 -162,13 +164,13 @@@ static int sched_feat_show(struct seq_f
  
  #ifdef HAVE_JUMP_LABEL
  
 -#define jump_label_key__true  jump_label_key_enabled
 -#define jump_label_key__false jump_label_key_disabled
 +#define jump_label_key__true  STATIC_KEY_INIT_TRUE
 +#define jump_label_key__false STATIC_KEY_INIT_FALSE
  
  #define SCHED_FEAT(name, enabled)     \
        jump_label_key__##enabled ,
  
 -struct jump_label_key sched_feat_keys[__SCHED_FEAT_NR] = {
 +struct static_key sched_feat_keys[__SCHED_FEAT_NR] = {
  #include "features.h"
  };
  
@@@ -178,14 -176,14 +178,14 @@@
  
  static void sched_feat_disable(int i)
  {
 -      if (jump_label_enabled(&sched_feat_keys[i]))
 -              jump_label_dec(&sched_feat_keys[i]);
 +      if (static_key_enabled(&sched_feat_keys[i]))
 +              static_key_slow_dec(&sched_feat_keys[i]);
  }
  
  static void sched_feat_enable(int i)
  {
 -      if (!jump_label_enabled(&sched_feat_keys[i]))
 -              jump_label_inc(&sched_feat_keys[i]);
 +      if (!static_key_enabled(&sched_feat_keys[i]))
 +              static_key_slow_inc(&sched_feat_keys[i]);
  }
  #else
  static void sched_feat_disable(int i) { };
@@@ -896,7 -894,7 +896,7 @@@ static void update_rq_clock_task(struc
        delta -= irq_delta;
  #endif
  #ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING
 -      if (static_branch((&paravirt_steal_rq_enabled))) {
 +      if (static_key_false((&paravirt_steal_rq_enabled))) {
                u64 st;
  
                steal = paravirt_steal_clock(cpu_of(rq));
@@@ -1265,29 -1263,59 +1265,59 @@@ EXPORT_SYMBOL_GPL(kick_process)
   */
  static int select_fallback_rq(int cpu, struct task_struct *p)
  {
-       int dest_cpu;
        const struct cpumask *nodemask = cpumask_of_node(cpu_to_node(cpu));
+       enum { cpuset, possible, fail } state = cpuset;
+       int dest_cpu;
  
        /* Look for allowed, online CPU in same node. */
-       for_each_cpu_and(dest_cpu, nodemask, cpu_active_mask)
+       for_each_cpu_mask(dest_cpu, *nodemask) {
+               if (!cpu_online(dest_cpu))
+                       continue;
+               if (!cpu_active(dest_cpu))
+                       continue;
                if (cpumask_test_cpu(dest_cpu, tsk_cpus_allowed(p)))
                        return dest_cpu;
+       }
  
-       /* Any allowed, online CPU? */
-       dest_cpu = cpumask_any_and(tsk_cpus_allowed(p), cpu_active_mask);
-       if (dest_cpu < nr_cpu_ids)
-               return dest_cpu;
+       for (;;) {
+               /* Any allowed, online CPU? */
+               for_each_cpu_mask(dest_cpu, *tsk_cpus_allowed(p)) {
+                       if (!cpu_online(dest_cpu))
+                               continue;
+                       if (!cpu_active(dest_cpu))
+                               continue;
+                       goto out;
+               }
  
-       /* No more Mr. Nice Guy. */
-       dest_cpu = cpuset_cpus_allowed_fallback(p);
-       /*
-        * Don't tell them about moving exiting tasks or
-        * kernel threads (both mm NULL), since they never
-        * leave kernel.
-        */
-       if (p->mm && printk_ratelimit()) {
-               printk_sched("process %d (%s) no longer affine to cpu%d\n",
-                               task_pid_nr(p), p->comm, cpu);
+               switch (state) {
+               case cpuset:
+                       /* No more Mr. Nice Guy. */
+                       cpuset_cpus_allowed_fallback(p);
+                       state = possible;
+                       break;
+ 
+               case possible:
+                       do_set_cpus_allowed(p, cpu_possible_mask);
+                       state = fail;
+                       break;
+ 
+               case fail:
+                       BUG();
+                       break;
+               }
+       }
+ 
+ out:
+       if (state != cpuset) {
+               /*
+                * Don't tell them about moving exiting tasks or
+                * kernel threads (both mm NULL), since they never
+                * leave kernel.
+                */
+               if (p->mm && printk_ratelimit()) {
+                       printk_sched("process %d (%s) no longer affine to cpu%d\n",
+                                       task_pid_nr(p), p->comm, cpu);
+               }
        }
  
        return dest_cpu;
@@@ -2756,7 -2784,7 +2786,7 @@@ void account_idle_time(cputime_t cputim
  static __always_inline bool steal_account_process_tick(void)
  {
  #ifdef CONFIG_PARAVIRT
 -      if (static_branch(&paravirt_steal_enabled)) {
 +      if (static_key_false(&paravirt_steal_enabled)) {
                u64 steal, st = 0;
  
                steal = paravirt_steal_clock(smp_processor_id());
@@@ -7573,7 -7601,8 +7603,7 @@@ static inline struct task_group *cgroup
                            struct task_group, css);
  }
  
 -static struct cgroup_subsys_state *
 -cpu_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cgrp)
 +static struct cgroup_subsys_state *cpu_cgroup_create(struct cgroup *cgrp)
  {
        struct task_group *tg, *parent;
  
@@@ -7590,14 -7619,15 +7620,14 @@@
        return &tg->css;
  }
  
 -static void
 -cpu_cgroup_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
 +static void cpu_cgroup_destroy(struct cgroup *cgrp)
  {
        struct task_group *tg = cgroup_tg(cgrp);
  
        sched_destroy_group(tg);
  }
  
 -static int cpu_cgroup_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
 +static int cpu_cgroup_can_attach(struct cgroup *cgrp,
                                 struct cgroup_taskset *tset)
  {
        struct task_struct *task;
@@@ -7615,7 -7645,7 +7645,7 @@@
        return 0;
  }
  
 -static void cpu_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
 +static void cpu_cgroup_attach(struct cgroup *cgrp,
                              struct cgroup_taskset *tset)
  {
        struct task_struct *task;
@@@ -7625,8 -7655,8 +7655,8 @@@
  }
  
  static void
 -cpu_cgroup_exit(struct cgroup_subsys *ss, struct cgroup *cgrp,
 -              struct cgroup *old_cgrp, struct task_struct *task)
 +cpu_cgroup_exit(struct cgroup *cgrp, struct cgroup *old_cgrp,
 +              struct task_struct *task)
  {
        /*
         * cgroup_exit() is called in the copy_process() failure path.
@@@ -7976,7 -8006,8 +8006,7 @@@ struct cgroup_subsys cpu_cgroup_subsys 
   */
  
  /* create a new cpu accounting group */
 -static struct cgroup_subsys_state *cpuacct_create(
 -      struct cgroup_subsys *ss, struct cgroup *cgrp)
 +static struct cgroup_subsys_state *cpuacct_create(struct cgroup *cgrp)
  {
        struct cpuacct *ca;
  
@@@ -8006,7 -8037,8 +8036,7 @@@ out
  }
  
  /* destroy an existing cpu accounting group */
 -static void
 -cpuacct_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
 +static void cpuacct_destroy(struct cgroup *cgrp)
  {
        struct cpuacct *ca = cgroup_ca(cgrp);
  

diff --combined kernel/sched/fair.c
index 94340c7,258f430..0d97ebd
--- 1/kernel/sched/fair.c
--- 2/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -416,8 -416,8 +416,8 @@@ find_matching_se(struct sched_entity **
  
  #endif        /* CONFIG_FAIR_GROUP_SCHED */
  
- static void account_cfs_rq_runtime(struct cfs_rq *cfs_rq,
-                                  unsigned long delta_exec);
+ static __always_inline
+ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec);
  
  /**************************************************************
   * Scheduling class tree data structure manipulation methods:
@@@ -1162,7 -1162,7 +1162,7 @@@ static void clear_buddies(struct cfs_r
                __clear_buddies_skip(se);
  }
  
- static void return_cfs_rq_runtime(struct cfs_rq *cfs_rq);
+ static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq);
  
  static void
  dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@@ -1386,20 -1386,20 +1386,20 @@@ entity_tick(struct cfs_rq *cfs_rq, stru
  #ifdef CONFIG_CFS_BANDWIDTH
  
  #ifdef HAVE_JUMP_LABEL
 -static struct jump_label_key __cfs_bandwidth_used;
 +static struct static_key __cfs_bandwidth_used;
  
  static inline bool cfs_bandwidth_used(void)
  {
 -      return static_branch(&__cfs_bandwidth_used);
 +      return static_key_false(&__cfs_bandwidth_used);
  }
  
  void account_cfs_bandwidth_used(int enabled, int was_enabled)
  {
        /* only need to count groups transitioning between enabled/!enabled */
        if (enabled && !was_enabled)
 -              jump_label_inc(&__cfs_bandwidth_used);
 +              static_key_slow_inc(&__cfs_bandwidth_used);
        else if (!enabled && was_enabled)
 -              jump_label_dec(&__cfs_bandwidth_used);
 +              static_key_slow_dec(&__cfs_bandwidth_used);
  }
  #else /* HAVE_JUMP_LABEL */
  static bool cfs_bandwidth_used(void)
@@@ -1546,8 -1546,8 +1546,8 @@@ static void __account_cfs_rq_runtime(st
                resched_task(rq_of(cfs_rq)->curr);
  }
  
- static __always_inline void account_cfs_rq_runtime(struct cfs_rq *cfs_rq,
-                                                  unsigned long delta_exec)
+ static __always_inline
+ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec)
  {
        if (!cfs_bandwidth_used() || !cfs_rq->runtime_enabled)
                return;
@@@ -2073,11 -2073,11 +2073,11 @@@ void unthrottle_offline_cfs_rqs(struct 
  }
  
  #else /* CONFIG_CFS_BANDWIDTH */
- static void account_cfs_rq_runtime(struct cfs_rq *cfs_rq,
-                                    unsigned long delta_exec) {}
+ static __always_inline
+ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec) {}
  static void check_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}
  static void check_enqueue_throttle(struct cfs_rq *cfs_rq) {}
- static void return_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}
+ static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq) {}
  
  static inline int cfs_rq_throttled(struct cfs_rq *cfs_rq)
  {