]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Feb 2015 18:48:44 +0000 (10:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Feb 2015 18:48:44 +0000 (10:48 -0800)
Pull char / misc patches from Greg KH:
 "Here's the big char/misc driver update for 3.20-rc1.

  Lots of little things in here, all described in the changelog.
  Nothing major or unusual, except maybe the binder selinux stuff, which
  was all acked by the proper selinux people and they thought it best to
  come through this tree.

  All of this has been in linux-next with no reported issues for a while"

* tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  coresight: fix function etm_writel_cp14() parameter order
  coresight-etm: remove check for unknown Kconfig macro
  coresight: fixing CPU hwid lookup in device tree
  coresight: remove the unnecessary function coresight_is_bit_set()
  coresight: fix the debug AMBA bus name
  coresight: remove the extra spaces
  coresight: fix the link between orphan connection and newly added device
  coresight: remove the unnecessary replicator property
  coresight: fix the replicator subtype value
  pdfdocs: Fix 'make pdfdocs' failure for 'uio-howto.tmpl'
  mcb: Fix error path of mcb_pci_probe
  virtio/console: verify device has config space
  ti-st: clean up data types (fix harmless memory corruption)
  mei: me: release hw from reset only during the reset flow
  mei: mask interrupt set bit on clean reset bit
  extcon: max77693: Constify struct regmap_config
  extcon: adc-jack: Release IIO channel on driver remove
  extcon: Remove duplicated include from extcon-class.c
  Drivers: hv: vmbus: hv_process_timer_expiration() can be static
  Drivers: hv: vmbus: serialize Offer and Rescind offer
  ...

1  2 
MAINTAINERS
drivers/char/mem.c
drivers/hv/vmbus_drv.c
security/security.c
security/selinux/hooks.c

diff --combined MAINTAINERS
index d854959aa519e018365c1b03e89ab005c6a72d90,b00535f1e74c415ed998d46bf1b74a62302e2e3c..71a65389ca4d8756d5f4f252b99e4b8bc34ce446
@@@ -270,12 -270,12 +270,12 @@@ F:      drivers/acpi
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
  F:    include/acpi/
 -F:    Documentation/acpi
 +F:    Documentation/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
  F:    drivers/pci/*acpi*
  F:    drivers/pci/*/*acpi*
  F:    drivers/pci/*/*/*acpi*
 -F:    tools/power/acpi
 +F:    tools/power/acpi/
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <robert.moore@intel.com>
@@@ -563,12 -563,6 +563,12 @@@ S:       Odd Fixe
  L:    linux-alpha@vger.kernel.org
  F:    arch/alpha/
  
 +ALTERA MAILBOX DRIVER
 +M:    Ley Foon Tan <lftan@altera.com>
 +L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/mailbox/mailbox-altera.c
 +
  ALTERA TRIPLE SPEED ETHERNET DRIVER
  M:    Vince Bridgers <vbridger@opensource.altera.com>
  L:    netdev@vger.kernel.org
@@@ -665,13 -659,6 +665,13 @@@ L:       linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADV7180 DRIVER
 +M:    Lars-Peter Clausen <lars@metafoo.de>
 +L:    linux-media@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/media/i2c/adv7180.c
 +
  ANALOG DEVICES INC ADV7511 DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -709,7 -696,7 +709,7 @@@ L: alsa-devel@alsa-project.org (moderat
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    sound/soc/blackfin/*
 - 
 +
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  M:    Michael Hennerich <Michael.Hennerich@analog.com>
@@@ -721,16 -708,6 +721,16 @@@ X:       drivers/iio/*/adjd
  F:    drivers/staging/iio/*/ad*
  F:    staging/iio/trigger/iio-trig-bfin-timer.c
  
 +ANDROID DRIVERS
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +M:    Arve Hjønnevåg <arve@android.com>
 +M:    Riley Andrews <riandrews@android.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
 +L:    devel@driverdev.osuosl.org
 +S:    Supported
 +F:    drivers/android/
 +F:    drivers/staging/android/
 +
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -777,6 -754,13 +777,6 @@@ L:        linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/i2c/aptina-pll.*
  
 -ARASAN COMPACT FLASH PATA CONTROLLER
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 -L:    linux-ide@vger.kernel.org
 -S:    Maintained
 -F:    include/linux/pata_arasan_cf_data.h
 -F:    drivers/ata/pata_arasan_cf.c
 -
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <jayalk@intworks.biz>
  S:    Maintained
@@@ -1173,7 -1157,6 +1173,7 @@@ M:      Sebastian Hesselbarth <sebastian.hes
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-mvebu/
 +F:    drivers/rtc/armada38x-rtc
  
  ARM/Marvell Berlin SoC support
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -1600,14 -1583,12 +1600,14 @@@ N:   xilin
  F:    drivers/clocksource/cadence_ttc_timer.c
  F:    drivers/i2c/busses/i2c-cadence.c
  F:    drivers/mmc/host/sdhci-of-arasan.c
 +F:    drivers/edac/synopsys_edac.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/iommu/arm-smmu.c
 +F:    drivers/iommu/io-pgtable-arm.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <catalin.marinas@arm.com>
@@@ -1676,6 -1657,7 +1676,6 @@@ M:      Jiri Slaby <jirislaby@gmail.com
  M:    Nick Kossifidis <mickflemm@gmail.com>
  M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    linux-wireless@vger.kernel.org
 -L:    ath5k-devel@lists.ath5k.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath5k
  S:    Maintained
  F:    drivers/net/wireless/ath/ath5k/
@@@ -2364,8 -2346,7 +2364,8 @@@ CAN NETWORK LAYE
  M:    Oliver Hartkopp <socketcan@hartkopp.net>
  L:    linux-can@vger.kernel.org
  W:    http://gitorious.org/linux-can
 -T:    git git://gitorious.org/linux-can/linux-can-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
  F:    Documentation/networking/can.txt
  F:    net/can/
@@@ -2380,8 -2361,7 +2380,8 @@@ M:      Wolfgang Grandegger <wg@grandegger.c
  M:    Marc Kleine-Budde <mkl@pengutronix.de>
  L:    linux-can@vger.kernel.org
  W:    http://gitorious.org/linux-can
 -T:    git git://gitorious.org/linux-can/linux-can-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
  F:    drivers/net/can/
  F:    include/linux/can/dev.h
@@@ -3033,6 -3013,7 +3033,7 @@@ F:      drivers/platform/x86/dell-laptop.
  
  DELL LAPTOP SMM DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
+ S:    Maintained
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -3048,7 -3029,7 +3049,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-wmi.c
  
  DESIGNWARE USB2 DRD IP DRIVER
 -M:    Paul Zimmerman <paulz@synopsys.com>
 +M:    John Youn <johnyoun@synopsys.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -3228,7 -3209,6 +3229,7 @@@ F:      Documentation
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
 +T:    git git://git.lwn.net/linux-2.6.git docs-next
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@@ -3488,14 -3468,6 +3489,14 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
 +E3X0 POWER BUTTON DRIVER
 +M:    Moritz Fischer <moritz.fischer@ettus.com>
 +L:    usrp-users@lists.ettus.com
 +W:    http://www.ettus.com
 +S:    Supported
 +F:    drivers/input/misc/e3x0-button.c
 +F:    Documentation/devicetree/bindings/input/e3x0-button.txt
 +
  E4000 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -3537,8 -3509,6 +3538,8 @@@ M:      Borislav Petkov <bp@alien8.de
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
 +T:    git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
  S:    Supported
  F:    Documentation/edac.txt
  F:    drivers/edac/
@@@ -4434,7 -4404,6 +4435,7 @@@ F:      include/linux/hwmon*.
  HARDWARE RANDOM NUMBER GENERATOR CORE
  M:    Matt Mackall <mpm@selenic.com>
  M:    Herbert Xu <herbert@gondor.apana.org.au>
 +L:    linux-crypto@vger.kernel.org
  S:    Odd fixes
  F:    Documentation/hw_random.txt
  F:    drivers/char/hw_random/
@@@ -4787,14 -4756,14 +4788,14 @@@ S:   Supporte
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
  IBM Power Virtual SCSI Device Drivers
 -M:    Nathan Fontenot <nfont@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvscsi*
  F:    drivers/scsi/ibmvscsi/viosrp.h
  
  IBM Power Virtual FC Device Drivers
 -M:    Brian King <brking@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
@@@ -4920,7 -4889,7 +4921,7 @@@ F:      drivers/ipack
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 -M:    Dmitry Kasatkin <d.kasatkin@samsung.com>
 +M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
  L:    linux-ima-devel@lists.sourceforge.net
  L:    linux-ima-user@lists.sourceforge.net
  L:    linux-security-module@vger.kernel.org
@@@ -4962,6 -4931,7 +4963,6 @@@ F:      include/uapi/linux/inotify.
  
  INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
  M:    Dmitry Torokhov <dmitry.torokhov@gmail.com>
 -M:    Dmitry Torokhov <dtor@mail.ru>
  L:    linux-input@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-input/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
@@@ -4980,19 -4950,10 +4981,19 @@@ F:   Documentation/input/multi-touch-prot
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
  
 +INTEL ASoC BDW/HSW DRIVERS
 +M:    Jie Yang <yang.jie@linux.intel.com>
 +L:    alsa-devel@alsa-project.org
 +S:    Supported
 +F:    sound/soc/intel/sst-haswell*
 +F:    sound/soc/intel/sst-dsp*
 +F:    sound/soc/intel/sst-firmware.c
 +F:    sound/soc/intel/broadwell.c
 +F:    sound/soc/intel/haswell.c
 +
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
  M:    Artur Paszkiewicz <artur.paszkiewicz@intel.com>
 -M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-scsi@vger.kernel.org
  T:    git git://git.code.sf.net/p/intel-sas/isci
  S:    Supported
@@@ -5743,49 -5704,6 +5744,49 @@@ F:    drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 +LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 +M:    Tejun Heo <tj@kernel.org>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/
 +F:    include/linux/ata.h
 +F:    include/linux/libata.h
 +
 +LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
 +M:    Viresh Kumar <viresh.linux@gmail.com>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    include/linux/pata_arasan_cf_data.h
 +F:    drivers/ata/pata_arasan_cf.c
 +
 +LIBATA PATA DRIVERS
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +M:    Tejun Heo <tj@kernel.org>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/pata_*.c
 +F:    drivers/ata/ata_generic.c
 +
 +LIBATA SATA AHCI PLATFORM devices support
 +M:    Hans de Goede <hdegoede@redhat.com>
 +M:    Tejun Heo <tj@kernel.org>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/ahci_platform.c
 +F:    drivers/ata/libahci_platform.c
 +F:    include/linux/ahci_platform.h
 +
 +LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
 +M:    Mikael Pettersson <mikpelinux@gmail.com>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/sata_promise.*
 +
  LIBLOCKDEP
  M:    Sasha Levin <sasha.levin@oracle.com>
  S:    Maintained
@@@ -5877,21 -5795,6 +5878,21 @@@ F:    Documentation/misc-devices/lis3lv02
  F:    drivers/misc/lis3lv02d/
  F:    drivers/platform/x86/hp_accel.c
  
 +LIVE PATCHING
 +M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Seth Jennings <sjenning@redhat.com>
 +M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Vojtech Pavlik <vojtech@suse.cz>
 +S:    Maintained
 +F:    kernel/livepatch/
 +F:    include/linux/livepatch.h
 +F:    arch/x86/include/asm/livepatch.h
 +F:    arch/x86/kernel/livepatch.c
 +F:    Documentation/ABI/testing/sysfs-kernel-livepatch
 +F:    samples/livepatch/
 +L:    live-patching@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
 +
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  S:    Maintained
@@@ -6190,13 -6093,6 +6191,13 @@@ F:    Documentation/devicetree/bindings/i2
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
  
 +MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 +M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Supported
 +F:    drivers/power/max14577_charger.c
 +F:    drivers/power/max77693_charger.c
 +
  MAXIRADIO FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -6227,6 -6123,14 +6228,6 @@@ F:     include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 -MEDIAVISION PRO MOVIE STUDIO DRIVER
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/parport/pms*
 -
  MEGARAID SCSI/SAS DRIVERS
  M:    Kashyap Desai <kashyap.desai@avagotech.com>
  M:    Sumit Saxena <sumit.saxena@avagotech.com>
@@@ -6644,10 -6548,9 +6645,10 @@@ F:    include/uapi/linux/netrom.
  F:    net/netrom/
  
  NETWORK BLOCK DEVICE (NBD)
 -M:    Paul Clements <Paul.Clements@steeleye.com>
 +M:    Markus Pargmann <mpa@pengutronix.de>
  S:    Maintained
  L:    nbd-general@lists.sourceforge.net
 +T:    git git://git.pengutronix.de/git/mpa/linux-nbd.git
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
@@@ -6676,7 -6579,6 +6677,7 @@@ F:      include/linux/netdevice.
  F:    include/uapi/linux/in.h
  F:    include/uapi/linux/net.h
  F:    include/uapi/linux/netdevice.h
 +F:    include/uapi/linux/net_namespace.h
  F:    tools/net/
  F:    tools/testing/selftests/net/
  F:    lib/random32.c
@@@ -6781,7 -6683,6 +6782,7 @@@ F:      Documentation/devicetree/bindings/ne
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <trond.myklebust@primarydata.com>
 +M:    Anna Schumaker <anna.schumaker@netapp.com>
  L:    linux-nfs@vger.kernel.org
  W:    http://client.linux-nfs.org
  T:    git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
@@@ -7087,12 -6988,14 +7088,12 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Grant Likely <grant.likely@linaro.org>
  M:    Rob Herring <robh+dt@kernel.org>
  L:    devicetree@vger.kernel.org
 -W:    http://fdt.secretlab.ca
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
 +W:    http://www.devicetree.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
  S:    Maintained
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 -K:    of_get_property
 -K:    of_match_table
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <robh+dt@kernel.org>
@@@ -7116,12 -7019,11 +7117,12 @@@ F:   arch/openrisc
  
  OPENVSWITCH
  M:    Pravin Shelar <pshelar@nicira.com>
 +L:    netdev@vger.kernel.org
  L:    dev@openvswitch.org
  W:    http://openvswitch.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
  S:    Maintained
  F:    net/openvswitch/
 +F:    include/uapi/linux/openvswitch.h
  
  OPL4 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
@@@ -7319,14 -7221,6 +7320,14 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR ARM VERSATILE PLATFORM
 +M:    Rob Herring <robh@kernel.org>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/versatile.txt
 +F:    drivers/pci/host/pci-versatile.c
 +
  PCI DRIVER FOR APPLIEDMICRO XGENE
  M:    Tanmay Inamdar <tinamdar@apm.com>
  L:    linux-pci@vger.kernel.org
@@@ -7346,7 -7240,7 +7347,7 @@@ S:      Maintaine
  F:    drivers/pci/host/*layerscape*
  
  PCI DRIVER FOR IMX6
 -M:    Richard Zhu <r65037@freescale.com>
 +M:    Richard Zhu <Richard.Zhu@freescale.com>
  M:    Lucas Stach <l.stach@pengutronix.de>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -7516,7 -7410,6 +7517,7 @@@ F:      drivers/crypto/picoxcell
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-gpio@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  S:    Maintained
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
@@@ -7684,6 -7577,12 +7685,6 @@@ W:     http://wireless.kernel.org/en/users/
  S:    Obsolete
  F:    drivers/net/wireless/prism54/
  
 -PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
 -M:    Mikael Pettersson <mikpelinux@gmail.com>
 -L:    linux-ide@vger.kernel.org
 -S:    Maintained
 -F:    drivers/ata/sata_promise.*
 -
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
  L:    netdev@vger.kernel.org
@@@ -7928,6 -7827,14 +7929,6 @@@ T:     git git://github.com/KrasnikovEugene
  S:    Supported
  F:    drivers/net/wireless/ath/wcn36xx/
  
 -QUICKCAM PARALLEL PORT WEBCAMS
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/parport/*-qcam*
 -
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <yehuda@inktank.com>
  M:    Sage Weil <sage@inktank.com>
@@@ -8116,13 -8023,6 +8117,13 @@@ S:    Maintaine
  F:    Documentation/rfkill.txt
  F:    net/rfkill/
  
 +RHASHTABLE
 +M:    Thomas Graf <tgraf@suug.ch>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    lib/rhashtable.c
 +F:    include/linux/rhashtable.h
 +
  RICOH SMARTMEDIA/XD DRIVER
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
  S:    Maintained
@@@ -8465,6 -8365,12 +8466,6 @@@ F:     kernel/time/clocksource.
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
  
 -TLG2300 VIDEO4LINUX-2 DRIVER
 -M:    Huang Shijie <shijie8@gmail.com>
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -S:    Odd Fixes
 -F:    drivers/media/usb/tlg2300/
 -
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <zwanem@gmail.com>
  S:    Maintained
@@@ -8650,6 -8556,25 +8651,6 @@@ S:     Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 -SERIAL ATA (SATA) SUBSYSTEM
 -M:    Tejun Heo <tj@kernel.org>
 -L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 -S:    Supported
 -F:    drivers/ata/
 -F:    include/linux/ata.h
 -F:    include/linux/libata.h
 -
 -SERIAL ATA AHCI PLATFORM devices support
 -M:    Hans de Goede <hdegoede@redhat.com>
 -M:    Tejun Heo <tj@kernel.org>
 -L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 -S:    Supported
 -F:    drivers/ata/ahci_platform.c
 -F:    drivers/ata/libahci_platform.c
 -F:    include/linux/ahci_platform.h
 -
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
  M:    Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
  L:    linux-scsi@vger.kernel.org
@@@ -8830,15 -8755,6 +8831,15 @@@ S:    Maintaine
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
 +TI AM437X VPFE DRIVER
 +M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 +S:    Maintained
 +F:    drivers/media/platform/am437x/
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -8920,8 -8836,6 +8921,8 @@@ F:      drivers/media/i2c/smiapp
  F:    include/media/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
 +F:    include/uapi/linux/smiapp.h
 +F:    Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
  
  SMM665 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -8988,7 -8902,6 +8989,7 @@@ SOFTLOGIC 6x10 MPEG CODE
  M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
  M:    Andrey Utkin <andrey.utkin@corp.bluecherry.net>
  M:    Andrey Utkin <andrey.krieger.utkin@gmail.com>
 +M:    Ismael Luceno <ismael@iodev.co.uk>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/pci/solo6x10/
@@@ -9301,13 -9214,6 +9302,13 @@@ F:    arch/m68k/sun3*
  F:    arch/m68k/include/asm/sun3*
  F:    drivers/net/ethernet/i825xx/sun3*
  
 +SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
 +F:    drivers/input/keyboard/sun4i-lradc-keys.c
 +
  SUNDANCE NETWORK DRIVER
  M:    Denis Kirjanov <kda@linux-powerpc.org>
  L:    netdev@vger.kernel.org
@@@ -9316,6 -9222,7 +9317,6 @@@ F:      drivers/net/ethernet/dlink/sundance.
  
  SUPERH
  L:    linux-sh@vger.kernel.org
 -W:    http://www.linux-sh.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
  S:    Orphan
  F:    Documentation/sh/
@@@ -9694,13 -9601,6 +9695,13 @@@ F:    drivers/power/lp8788-charger.
  F:    drivers/regulator/lp8788-*.c
  F:    include/linux/mfd/lp8788*.h
  
 +TI NETCP ETHERNET DRIVER
 +M:    Wingman Kwok <w-kwok2@ti.com>
 +M:    Murali Karicheri <m-karicheri2@ti.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/ti/netcp*
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -9728,7 -9628,7 +9729,7 @@@ F:      net/tipc
  
  TILE ARCHITECTURE
  M:    Chris Metcalf <cmetcalf@ezchip.com>
 -W:    http://www.tilera.com/scm/
 +W:    http://www.ezchip.com/scm/
  S:    Supported
  F:    arch/tile/
  F:    drivers/char/tile-srom.c
@@@ -9821,21 -9721,13 +9822,21 @@@ F:   drivers/media/pci/tw68
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <peterhuewe@gmx.de>
 -M:    Ashley Lai <ashley@ashleylai.com>
  M:    Marcel Selhorst <tpmdd@selhorst.net>
  W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 +Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
 +T:    https://github.com/PeterHuewe/linux-tpmdd
  S:    Maintained
  F:    drivers/char/tpm/
  
 +TPM IBM_VTPM DEVICE DRIVER
 +M:    Ashley Lai <ashleydlai@gmail.com>
 +W:    http://tpmdd.sourceforge.net
 +L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/char/tpm/tpm_ibmvtpm*
 +
  TRACING
  M:    Steven Rostedt <rostedt@goodmis.org>
  M:    Ingo Molnar <mingo@redhat.com>
@@@ -9990,15 -9882,20 +9991,15 @@@ F:   drivers/scsi/ufs
  
  UNSORTED BLOCK IMAGES (UBI)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
 +M:    Richard Weinberger <richard@nod.at>
  W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubifs-2.6.git
 -S:    Maintained
 +S:    Supported
  F:    drivers/mtd/ubi/
  F:    include/linux/mtd/ubi.h
  F:    include/uapi/mtd/ubi-user.h
  
 -UNSORTED BLOCK IMAGES (UBI) Fastmap
 -M:    Richard Weinberger <richard@nod.at>
 -L:    linux-mtd@lists.infradead.org
 -S:    Maintained
 -F:    drivers/mtd/ubi/fastmap.c
 -
  USB ACM DRIVER
  M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
@@@ -10260,7 -10157,6 +10261,7 @@@ USERSPACE I/O (UIO
  M:    "Hans J. Koch" <hjk@hansjkoch.de>
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/DocBook/uio-howto.tmpl
  F:    drivers/uio/
  F:    include/linux/uio*.h
@@@ -10688,7 -10584,6 +10689,7 @@@ F:   drivers/pci/*xen
  
  XEN BLOCK SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Roger Pau Monné <roger.pau@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/block/xen-blkback/*
@@@ -10744,7 -10639,6 +10745,7 @@@ M:   Max Filippov <jcmvbkbc@gmail.com
  L:    linux-xtensa@linux-xtensa.org
  S:    Maintained
  F:    drivers/spi/spi-xtensa-xtfpga.c
 +F:    sound/soc/xtensa/xtfpga-i2s.c
  
  YAM DRIVER FOR AX.25
  M:    Jean-Paul Roubelat <jpr@f6fbb.org>
diff --combined drivers/char/mem.c
index 9a6b63783a94dd19a4f49133fd94265fad98c19c,080273287c48842ab95b1d84f1c55bf13f0ae327..297110c12635d3b8c36b53a7f089aa2666024eca
@@@ -28,7 -28,7 +28,7 @@@
  #include <linux/io.h>
  #include <linux/aio.h>
  
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
  
  #ifdef CONFIG_IA64
  # include <linux/efi.h>
@@@ -287,24 -287,13 +287,24 @@@ static unsigned long get_unmapped_area_
        return pgoff << PAGE_SHIFT;
  }
  
 +/* permit direct mmap, for read, write or exec */
 +static unsigned memory_mmap_capabilities(struct file *file)
 +{
 +      return NOMMU_MAP_DIRECT |
 +              NOMMU_MAP_READ | NOMMU_MAP_WRITE | NOMMU_MAP_EXEC;
 +}
 +
 +static unsigned zero_mmap_capabilities(struct file *file)
 +{
 +      return NOMMU_MAP_COPY;
 +}
 +
  /* can't do an in-place private mapping if there's no MMU */
  static inline int private_mapping_ok(struct vm_area_struct *vma)
  {
        return vma->vm_flags & VM_MAYSHARE;
  }
  #else
 -#define get_unmapped_area_mem NULL
  
  static inline int private_mapping_ok(struct vm_area_struct *vma)
  {
@@@ -352,7 -341,6 +352,6 @@@ static int mmap_mem(struct file *file, 
        return 0;
  }
  
- #ifdef CONFIG_DEVKMEM
  static int mmap_kmem(struct file *file, struct vm_area_struct *vma)
  {
        unsigned long pfn;
        vma->vm_pgoff = pfn;
        return mmap_mem(file, vma);
  }
- #endif
  
- #ifdef CONFIG_DEVKMEM
  /*
   * This function reads the *virtual* memory as seen by the kernel.
   */
@@@ -555,9 -541,7 +552,7 @@@ static ssize_t write_kmem(struct file *
        *ppos = p;
        return virtr + wrote ? : err;
  }
- #endif
  
- #ifdef CONFIG_DEVPORT
  static ssize_t read_port(struct file *file, char __user *buf,
                         size_t count, loff_t *ppos)
  {
@@@ -586,6 -570,7 +581,7 @@@ static ssize_t write_port(struct file *
                return -EFAULT;
        while (count-- > 0 && i < 65536) {
                char c;
                if (__get_user(c, tmp)) {
                        if (tmp > buf)
                                break;
        *ppos = i;
        return tmp-buf;
  }
- #endif
  
  static ssize_t read_null(struct file *file, char __user *buf,
                         size_t count, loff_t *ppos)
@@@ -642,6 -626,7 +637,7 @@@ static ssize_t read_iter_zero(struct ki
  
        while (iov_iter_count(iter)) {
                size_t chunk = iov_iter_count(iter), n;
                if (chunk > PAGE_SIZE)
                        chunk = PAGE_SIZE;      /* Just for latency reasons */
                n = iov_iter_zero(chunk, iter);
@@@ -726,31 -711,23 +722,29 @@@ static int open_port(struct inode *inod
  #define open_mem      open_port
  #define open_kmem     open_mem
  
- static const struct file_operations mem_fops = {
+ static const struct file_operations __maybe_unused mem_fops = {
        .llseek         = memory_lseek,
        .read           = read_mem,
        .write          = write_mem,
        .mmap           = mmap_mem,
        .open           = open_mem,
 +#ifndef CONFIG_MMU
        .get_unmapped_area = get_unmapped_area_mem,
 +      .mmap_capabilities = memory_mmap_capabilities,
 +#endif
  };
  
- #ifdef CONFIG_DEVKMEM
- static const struct file_operations kmem_fops = {
+ static const struct file_operations __maybe_unused kmem_fops = {
        .llseek         = memory_lseek,
        .read           = read_kmem,
        .write          = write_kmem,
        .mmap           = mmap_kmem,
        .open           = open_kmem,
 +#ifndef CONFIG_MMU
        .get_unmapped_area = get_unmapped_area_mem,
 +      .mmap_capabilities = memory_mmap_capabilities,
 +#endif
  };
- #endif
  
  static const struct file_operations null_fops = {
        .llseek         = null_lseek,
        .splice_write   = splice_write_null,
  };
  
- #ifdef CONFIG_DEVPORT
- static const struct file_operations port_fops = {
+ static const struct file_operations __maybe_unused port_fops = {
        .llseek         = memory_lseek,
        .read           = read_port,
        .write          = write_port,
        .open           = open_port,
  };
- #endif
  
  static const struct file_operations zero_fops = {
        .llseek         = zero_lseek,
        .read_iter      = read_iter_zero,
        .aio_write      = aio_write_zero,
        .mmap           = mmap_zero,
 -};
 -
 -/*
 - * capabilities for /dev/zero
 - * - permits private mappings, "copies" are taken of the source of zeros
 - * - no writeback happens
 - */
 -static struct backing_dev_info zero_bdi = {
 -      .name           = "char/mem",
 -      .capabilities   = BDI_CAP_MAP_COPY | BDI_CAP_NO_ACCT_AND_WRITEBACK,
 +#ifndef CONFIG_MMU
 +      .mmap_capabilities = zero_mmap_capabilities,
 +#endif
  };
  
  static const struct file_operations full_fops = {
@@@ -793,22 -775,24 +785,24 @@@ static const struct memdev 
        const char *name;
        umode_t mode;
        const struct file_operations *fops;
 -      struct backing_dev_info *dev_info;
 +      fmode_t fmode;
  } devlist[] = {
 -       [1] = { "mem", 0, &mem_fops, &directly_mappable_cdev_bdi },
+ #ifdef CONFIG_DEVMEM
 +       [1] = { "mem", 0, &mem_fops, FMODE_UNSIGNED_OFFSET },
+ #endif
  #ifdef CONFIG_DEVKMEM
 -       [2] = { "kmem", 0, &kmem_fops, &directly_mappable_cdev_bdi },
 +       [2] = { "kmem", 0, &kmem_fops, FMODE_UNSIGNED_OFFSET },
  #endif
 -       [3] = { "null", 0666, &null_fops, NULL },
 +       [3] = { "null", 0666, &null_fops, 0 },
  #ifdef CONFIG_DEVPORT
 -       [4] = { "port", 0, &port_fops, NULL },
 +       [4] = { "port", 0, &port_fops, 0 },
  #endif
 -       [5] = { "zero", 0666, &zero_fops, &zero_bdi },
 -       [7] = { "full", 0666, &full_fops, NULL },
 -       [8] = { "random", 0666, &random_fops, NULL },
 -       [9] = { "urandom", 0666, &urandom_fops, NULL },
 +       [5] = { "zero", 0666, &zero_fops, 0 },
 +       [7] = { "full", 0666, &full_fops, 0 },
 +       [8] = { "random", 0666, &random_fops, 0 },
 +       [9] = { "urandom", 0666, &urandom_fops, 0 },
  #ifdef CONFIG_PRINTK
 -      [11] = { "kmsg", 0644, &kmsg_fops, NULL },
 +      [11] = { "kmsg", 0644, &kmsg_fops, 0 },
  #endif
  };
  
@@@ -826,7 -810,12 +820,7 @@@ static int memory_open(struct inode *in
                return -ENXIO;
  
        filp->f_op = dev->fops;
 -      if (dev->dev_info)
 -              filp->f_mapping->backing_dev_info = dev->dev_info;
 -
 -      /* Is /dev/mem or /dev/kmem ? */
 -      if (dev->dev_info == &directly_mappable_cdev_bdi)
 -              filp->f_mode |= FMODE_UNSIGNED_OFFSET;
 +      filp->f_mode |= dev->fmode;
  
        if (dev->fops->open)
                return dev->fops->open(inode, filp);
@@@ -851,6 -840,11 +845,6 @@@ static struct class *mem_class
  static int __init chr_dev_init(void)
  {
        int minor;
 -      int err;
 -
 -      err = bdi_init(&zero_bdi);
 -      if (err)
 -              return err;
  
        if (register_chrdev(MEM_MAJOR, "mem", &memory_fops))
                printk("unable to get major %d for memory devs\n", MEM_MAJOR);
diff --combined drivers/hv/vmbus_drv.c
index bb3725b672cf0d58d4eb9d58efca7f85d8b32ef7,35e3f422ad7bda3790767dcb4e527db7d08133c3..f518b8d7a5b5190eb01b741d0961f6b9fbf6cd33
@@@ -32,6 -32,7 +32,7 @@@
  #include <linux/completion.h>
  #include <linux/hyperv.h>
  #include <linux/kernel_stat.h>
+ #include <linux/clockchips.h>
  #include <asm/hyperv.h>
  #include <asm/hypervisor.h>
  #include <asm/mshyperv.h>
@@@ -578,6 -579,34 +579,34 @@@ static void vmbus_onmessage_work(struc
        kfree(ctx);
  }
  
+ static void hv_process_timer_expiration(struct hv_message *msg, int cpu)
+ {
+       struct clock_event_device *dev = hv_context.clk_evt[cpu];
+       if (dev->event_handler)
+               dev->event_handler(dev);
+       msg->header.message_type = HVMSG_NONE;
+       /*
+        * Make sure the write to MessageType (ie set to
+        * HVMSG_NONE) happens before we read the
+        * MessagePending and EOMing. Otherwise, the EOMing
+        * will not deliver any more messages since there is
+        * no empty slot
+        */
+       mb();
+       if (msg->header.message_flags.msg_pending) {
+               /*
+                * This will cause message queue rescan to
+                * possibly deliver another msg from the
+                * hypervisor
+                */
+               wrmsrl(HV_X64_MSR_EOM, 0);
+       }
+ }
  static void vmbus_on_msg_dpc(unsigned long data)
  {
        int cpu = smp_processor_id();
@@@ -667,8 -696,12 +696,12 @@@ static void vmbus_isr(void
        msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;
  
        /* Check if there are actual msgs to be processed */
-       if (msg->header.message_type != HVMSG_NONE)
-               tasklet_schedule(&msg_dpc);
+       if (msg->header.message_type != HVMSG_NONE) {
+               if (msg->header.message_type == HVMSG_TIMER_EXPIRED)
+                       hv_process_timer_expiration(msg, cpu);
+               else
+                       tasklet_schedule(&msg_dpc);
+       }
  }
  
  /*
@@@ -861,8 -894,8 +894,8 @@@ static acpi_status vmbus_walk_resources
                break;
  
        case ACPI_RESOURCE_TYPE_ADDRESS64:
 -              hyperv_mmio.start = res->data.address64.minimum;
 -              hyperv_mmio.end = res->data.address64.maximum;
 +              hyperv_mmio.start = res->data.address64.address.minimum;
 +              hyperv_mmio.end = res->data.address64.address.maximum;
                break;
        }
  
diff --combined security/security.c
index a0442b20f001b80f6cf567c8aad4e9a038e901d3,b196de34b19ff91a8b44404a733f741a430dcabb..e81d5bbe7363fc689199ea8db3a1a5fdc3e720e4
@@@ -135,6 -135,29 +135,29 @@@ int __init register_security(struct sec
  
  /* Security operations */
  
+ int security_binder_set_context_mgr(struct task_struct *mgr)
+ {
+       return security_ops->binder_set_context_mgr(mgr);
+ }
+ int security_binder_transaction(struct task_struct *from,
+                               struct task_struct *to)
+ {
+       return security_ops->binder_transaction(from, to);
+ }
+ int security_binder_transfer_binder(struct task_struct *from,
+                                   struct task_struct *to)
+ {
+       return security_ops->binder_transfer_binder(from, to);
+ }
+ int security_binder_transfer_file(struct task_struct *from,
+                                 struct task_struct *to, struct file *file)
+ {
+       return security_ops->binder_transfer_file(from, to, file);
+ }
  int security_ptrace_access_check(struct task_struct *child, unsigned int mode)
  {
  #ifdef CONFIG_SECURITY_YAMA_STACKED
@@@ -726,15 -749,16 +749,15 @@@ static inline unsigned long mmap_prot(s
                return prot | PROT_EXEC;
        /*
         * ditto if it's not on noexec mount, except that on !MMU we need
 -       * BDI_CAP_EXEC_MMAP (== VM_MAYEXEC) in this case
 +       * NOMMU_MAP_EXEC (== VM_MAYEXEC) in this case
         */
        if (!(file->f_path.mnt->mnt_flags & MNT_NOEXEC)) {
  #ifndef CONFIG_MMU
 -              unsigned long caps = 0;
 -              struct address_space *mapping = file->f_mapping;
 -              if (mapping && mapping->backing_dev_info)
 -                      caps = mapping->backing_dev_info->capabilities;
 -              if (!(caps & BDI_CAP_EXEC_MAP))
 -                      return prot;
 +              if (file->f_op->mmap_capabilities) {
 +                      unsigned caps = file->f_op->mmap_capabilities(file);
 +                      if (!(caps & NOMMU_MAP_EXEC))
 +                              return prot;
 +              }
  #endif
                return prot | PROT_EXEC;
        }
diff --combined security/selinux/hooks.c
index 87a915656eab61eb3c34638852ef2b91cdeee086,9d984bfb978bcee8d145a74afe1ca27136a2499b..29c39e0b03ed7e3048d5fed858f31d40dc2f8d3d
@@@ -401,14 -401,23 +401,14 @@@ static int selinux_is_sblabel_mnt(struc
  {
        struct superblock_security_struct *sbsec = sb->s_security;
  
 -      if (sbsec->behavior == SECURITY_FS_USE_XATTR ||
 -          sbsec->behavior == SECURITY_FS_USE_TRANS ||
 -          sbsec->behavior == SECURITY_FS_USE_TASK)
 -              return 1;
 -
 -      /* Special handling for sysfs. Is genfs but also has setxattr handler*/
 -      if (strncmp(sb->s_type->name, "sysfs", sizeof("sysfs")) == 0)
 -              return 1;
 -
 -      /*
 -       * Special handling for rootfs. Is genfs but supports
 -       * setting SELinux context on in-core inodes.
 -       */
 -      if (strncmp(sb->s_type->name, "rootfs", sizeof("rootfs")) == 0)
 -              return 1;
 -
 -      return 0;
 +      return sbsec->behavior == SECURITY_FS_USE_XATTR ||
 +              sbsec->behavior == SECURITY_FS_USE_TRANS ||
 +              sbsec->behavior == SECURITY_FS_USE_TASK ||
 +              /* Special handling. Genfs but also in-core setxattr handler */
 +              !strcmp(sb->s_type->name, "sysfs") ||
 +              !strcmp(sb->s_type->name, "pstore") ||
 +              !strcmp(sb->s_type->name, "debugfs") ||
 +              !strcmp(sb->s_type->name, "rootfs");
  }
  
  static int sb_finish_set_opts(struct super_block *sb)
        if (sbsec->behavior > ARRAY_SIZE(labeling_behaviors))
                printk(KERN_ERR "SELinux: initialized (dev %s, type %s), unknown behavior\n",
                       sb->s_id, sb->s_type->name);
 -      else
 -              printk(KERN_DEBUG "SELinux: initialized (dev %s, type %s), %s\n",
 -                     sb->s_id, sb->s_type->name,
 -                     labeling_behaviors[sbsec->behavior-1]);
  
        sbsec->flags |= SE_SBINITIALIZED;
        if (selinux_is_sblabel_mnt(sb))
@@@ -1920,6 -1933,74 +1920,74 @@@ static inline u32 open_file_to_av(struc
  
  /* Hook functions begin here. */
  
+ static int selinux_binder_set_context_mgr(struct task_struct *mgr)
+ {
+       u32 mysid = current_sid();
+       u32 mgrsid = task_sid(mgr);
+       return avc_has_perm(mysid, mgrsid, SECCLASS_BINDER,
+                           BINDER__SET_CONTEXT_MGR, NULL);
+ }
+ static int selinux_binder_transaction(struct task_struct *from,
+                                     struct task_struct *to)
+ {
+       u32 mysid = current_sid();
+       u32 fromsid = task_sid(from);
+       u32 tosid = task_sid(to);
+       int rc;
+       if (mysid != fromsid) {
+               rc = avc_has_perm(mysid, fromsid, SECCLASS_BINDER,
+                                 BINDER__IMPERSONATE, NULL);
+               if (rc)
+                       return rc;
+       }
+       return avc_has_perm(fromsid, tosid, SECCLASS_BINDER, BINDER__CALL,
+                           NULL);
+ }
+ static int selinux_binder_transfer_binder(struct task_struct *from,
+                                         struct task_struct *to)
+ {
+       u32 fromsid = task_sid(from);
+       u32 tosid = task_sid(to);
+       return avc_has_perm(fromsid, tosid, SECCLASS_BINDER, BINDER__TRANSFER,
+                           NULL);
+ }
+ static int selinux_binder_transfer_file(struct task_struct *from,
+                                       struct task_struct *to,
+                                       struct file *file)
+ {
+       u32 sid = task_sid(to);
+       struct file_security_struct *fsec = file->f_security;
+       struct inode *inode = file->f_path.dentry->d_inode;
+       struct inode_security_struct *isec = inode->i_security;
+       struct common_audit_data ad;
+       int rc;
+       ad.type = LSM_AUDIT_DATA_PATH;
+       ad.u.path = file->f_path;
+       if (sid != fsec->sid) {
+               rc = avc_has_perm(sid, fsec->sid,
+                                 SECCLASS_FD,
+                                 FD__USE,
+                                 &ad);
+               if (rc)
+                       return rc;
+       }
+       if (unlikely(IS_PRIVATE(inode)))
+               return 0;
+       return avc_has_perm(sid, isec->sid, isec->sclass, file_to_av(file),
+                           &ad);
+ }
  static int selinux_ptrace_access_check(struct task_struct *child,
                                     unsigned int mode)
  {
@@@ -5797,6 -5878,11 +5865,11 @@@ static int selinux_key_getsecurity(stru
  static struct security_operations selinux_ops = {
        .name =                         "selinux",
  
+       .binder_set_context_mgr =       selinux_binder_set_context_mgr,
+       .binder_transaction =           selinux_binder_transaction,
+       .binder_transfer_binder =       selinux_binder_transfer_binder,
+       .binder_transfer_file =         selinux_binder_transfer_file,
        .ptrace_access_check =          selinux_ptrace_access_check,
        .ptrace_traceme =               selinux_ptrace_traceme,
        .capget =                       selinux_capget,