Skip to contentSkip to conversation

Linux 4.1.4

DISCUSSION Greg KH 1 participant 2 messages Aug 3, 2015 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 4.1.4 kernel.

All users of the 4.1 kernel series must upgrade.

The updated 4.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.1.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Documentation/ABI/testing/ima_policy                                     |   26 
 Documentation/ABI/testing/sysfs-ata                                      |   11 
 Documentation/ABI/testing/sysfs-bus-iio                                  |    6 
 Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt |    4 
 Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt |    4 
 Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt |   38 
 Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt  |   32 
 Documentation/devicetree/bindings/usb/atmel-usb.txt                      |    6 
 Documentation/kernel-parameters.txt                                      |   10 
 Makefile                                                                 |    2 
 arch/arm/boot/dts/at91-sama5d4ek.dts                                     |    4 
 arch/arm/boot/dts/at91sam9g45.dtsi                                       |    2 
 arch/arm/boot/dts/at91sam9x5.dtsi                                        |    2 
 arch/arm/boot/dts/imx23.dtsi                                             |    1 
 arch/arm/boot/dts/sama5d3.dtsi                                           |    2 
 arch/arm/boot/dts/sama5d4.dtsi                                           |   22 
 arch/arm/kernel/smp.c                                                    |    4 
 arch/arm/mach-dove/include/mach/irqs.h                                   |  118 +--
 arch/arm/mach-dove/irq.c                                                 |    8 
 arch/arm/vdso/vdsomunge.c                                                |   56 -
 arch/arm64/kernel/smp.c                                                  |    4 
 arch/arm64/mm/hugetlbpage.c                                              |    4 
 arch/arm64/net/bpf_jit.h                                                 |    4 
 arch/arm64/net/bpf_jit_comp.c                                            |   29 
 arch/m68k/Kconfig.cpu                                                    |   41 -
 arch/m68k/include/asm/coldfire.h                                         |    2 
 arch/openrisc/Kconfig                                                    |    4 
 arch/x86/mm/mmap.c                                                       |    7 
 arch/x86/mm/mpx.c                                                        |   20 
 block/bio.c                                                              |   15 
 crypto/asymmetric_keys/asymmetric_keys.h                                 |    3 
 crypto/asymmetric_keys/asymmetric_type.c                                 |   20 
 crypto/asymmetric_keys/x509_public_key.c                                 |   23 
 drivers/acpi/acpi_lpss.c                                                 |    7 
 drivers/acpi/acpica/aclocal.h                                            |    1 
 drivers/acpi/acpica/tbfadt.c                                             |   21 
 drivers/acpi/acpica/tbutils.c                                            |   34 
 drivers/acpi/acpica/tbxfload.c                                           |    3 
 drivers/acpi/acpica/utxfinit.c                                           |   10 
 drivers/acpi/osl.c                                                       |   12 
 drivers/acpi/resource.c                                                  |  184 ----
 drivers/ata/libata-core.c                                                |   23 
 drivers/ata/libata-eh.c                                                  |   13 
 drivers/ata/libata-scsi.c                                                |    3 
 drivers/ata/libata-transport.c                                           |   24 
 drivers/base/firmware_class.c                                            |   16 
 drivers/base/power/clock_ops.c                                           |    2 
 drivers/block/loop.c                                                     |   30 
 drivers/block/loop.h                                                     |    1 
 drivers/block/rbd.c                                                      |    4 
 drivers/bluetooth/btbcm.c                                                |   11 
 drivers/bluetooth/btusb.c                                                |   38 
 drivers/bus/arm-ccn.c                                                    |    2 
 drivers/char/agp/intel-gtt.c                                             |    2 
 drivers/char/tpm/tpm-chip.c                                              |    3 
 drivers/char/tpm/tpm_crb.c                                               |   12 
 drivers/char/tpm/tpm_ibmvtpm.c                                           |    5 
 drivers/clk/clk.c                                                        |    5 
 drivers/clk/qcom/clk-rcg2.c                                              |    9 
 drivers/clk/ti/clk-dra7-atl.c                                            |    5 
 drivers/clocksource/exynos_mct.c                                         |   43 -
 drivers/dma/mv_xor.c                                                     |   72 +
 drivers/dma/mv_xor.h                                                     |    1 
 drivers/edac/octeon_edac-l2c.c                                           |    2 
 drivers/edac/octeon_edac-lmc.c                                           |    2 
 drivers/edac/octeon_edac-pc.c                                            |    2 
 drivers/firmware/dmi_scan.c                                              |   13 
 drivers/gpu/drm/bridge/ptn3460.c                                         |    1 
 drivers/gpu/drm/drm_crtc.c                                               |   12 
 drivers/gpu/drm/drm_dp_mst_topology.c                                    |   67 +
 drivers/gpu/drm/drm_ioc32.c                                              |   60 +
 drivers/gpu/drm/i915/i915_gem.c                                          |    1 
 drivers/gpu/drm/i915/i915_gem_gtt.c                                      |    6 
 drivers/gpu/drm/i915/i915_ioc32.c                                        |    2 
 drivers/gpu/drm/i915/i915_irq.c                                          |   13 
 drivers/gpu/drm/i915/i915_reg.h                                          |    1 
 drivers/gpu/drm/i915/intel_display.c                                     |   13 
 drivers/gpu/drm/i915/intel_drv.h                                         |    1 
 drivers/gpu/drm/i915/intel_panel.c                                       |    8 
 drivers/gpu/drm/i915/intel_ringbuffer.h                                  |    7 
 drivers/gpu/drm/i915/intel_uncore.c                                      |   26 
 drivers/gpu/drm/qxl/qxl_cmd.c                                            |    1 
 drivers/gpu/drm/qxl/qxl_ioctl.c                                          |    4 
 drivers/gpu/drm/radeon/ci_dpm.c                                          |    2 
 drivers/gpu/drm/radeon/cik.c                                             |  370 +++++----
 drivers/gpu/drm/radeon/cik_sdma.c                                        |   11 
 drivers/gpu/drm/radeon/evergreen.c                                       |  392 +++++-----
 drivers/gpu/drm/radeon/r600.c                                            |  155 ++-
 drivers/gpu/drm/radeon/radeon_audio.c                                    |   36 
 drivers/gpu/drm/radeon/radeon_audio.h                                    |    2 
 drivers/gpu/drm/radeon/radeon_cursor.c                                   |   84 --
 drivers/gpu/drm/radeon/radeon_device.c                                   |   34 
 drivers/gpu/drm/radeon/radeon_fb.c                                       |    1 
 drivers/gpu/drm/radeon/radeon_gart.c                                     |   12 
 drivers/gpu/drm/radeon/radeon_gem.c                                      |    2 
 drivers/gpu/drm/radeon/radeon_irq_kms.c                                  |    2 
 drivers/gpu/drm/radeon/radeon_mode.h                                     |    1 
 drivers/gpu/drm/radeon/radeon_object.c                                   |    1 
 drivers/gpu/drm/radeon/si.c                                              |  336 ++++----
 drivers/gpu/drm/radeon/si_dpm.c                                          |    1 
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c                              |   67 -
 drivers/gpu/drm/tegra/dpaux.c                                            |   18 
 drivers/gpu/drm/vgem/vgem_drv.c                                          |    2 
 drivers/hwmon/mcp3021.c                                                  |   14 
 drivers/hwmon/nct7802.c                                                  |    2 
 drivers/i2c/busses/i2c-at91.c                                            |   70 +
 drivers/i2c/i2c-mux.c                                                    |    3 
 drivers/i2c/muxes/i2c-mux-pca9541.c                                      |    4 
 drivers/i2c/muxes/i2c-mux-pca954x.c                                      |    2 
 drivers/iio/accel/bmc150-accel.c                                         |    2 
 drivers/iio/adc/Kconfig                                                  |    3 
 drivers/iio/adc/at91_adc.c                                               |    8 
 drivers/iio/adc/rockchip_saradc.c                                        |    4 
 drivers/iio/adc/twl4030-madc.c                                           |    3 
 drivers/iio/common/hid-sensors/hid-sensor-trigger.c                      |   11 
 drivers/iio/dac/ad5624r_spi.c                                            |    4 
 drivers/iio/imu/inv_mpu6050/inv_mpu_core.c                               |   18 
 drivers/iio/light/cm3323.c                                               |    2 
 drivers/iio/light/tcs3414.c                                              |    2 
 drivers/iio/proximity/sx9500.c                                           |    2 
 drivers/iio/temperature/tmp006.c                                         |    3 
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c                              |    1 
 drivers/md/bitmap.c                                                      |   15 
 drivers/md/dm-cache-policy-cleaner.c                                     |    3 
 drivers/md/dm-cache-policy-internal.h                                    |    5 
 drivers/md/dm-cache-policy-mq.c                                          |   41 -
 drivers/md/dm-cache-policy.h                                             |   15 
 drivers/md/dm-cache-target.c                                             |   58 -
 drivers/md/dm-stats.c                                                    |    2 
 drivers/md/dm-thin.c                                                     |   13 
 drivers/md/md.c                                                          |    9 
 drivers/md/persistent-data/dm-btree-remove.c                             |    6 
 drivers/md/persistent-data/dm-btree.c                                    |    2 
 drivers/md/persistent-data/dm-space-map-metadata.c                       |   50 -
 drivers/media/dvb-frontends/af9013.c                                     |    4 
 drivers/media/dvb-frontends/cx24116.c                                    |    8 
 drivers/media/dvb-frontends/cx24117.c                                    |    2 
 drivers/media/dvb-frontends/s5h1420.c                                    |    2 
 drivers/media/pci/cx18/cx18-streams.c                                    |    1 
 drivers/media/pci/saa7164/saa7164-encoder.c                              |   11 
 drivers/media/pci/saa7164/saa7164-vbi.c                                  |   11 
 drivers/media/usb/dvb-usb/dib0700_core.c                                 |   70 +
 drivers/media/usb/dvb-usb/dib0700_devices.c                              |    6 
 drivers/media/v4l2-core/videobuf2-core.c                                 |   33 
 drivers/mmc/card/block.c                                                 |   10 
 drivers/mmc/host/sdhci.c                                                 |    9 
 drivers/net/ethernet/intel/e1000e/82571.c                                |    2 
 drivers/net/ethernet/intel/e1000e/ich8lan.c                              |   10 
 drivers/net/ethernet/intel/e1000e/netdev.c                               |   18 
 drivers/net/wireless/ath/ath9k/htc.h                                     |    6 
 drivers/net/wireless/ath/ath9k/main.c                                    |   12 
 drivers/net/wireless/iwlwifi/mvm/debugfs.c                               |    5 
 drivers/net/wireless/iwlwifi/mvm/mac80211.c                              |    2 
 drivers/net/wireless/iwlwifi/mvm/mvm.h                                   |    1 
 drivers/net/wireless/iwlwifi/mvm/time-event.c                            |   15 
 drivers/net/wireless/rtlwifi/rtl8188ee/hw.c                              |   16 
 drivers/net/wireless/rtlwifi/rtl8192ee/hw.c                              |   17 
 drivers/net/wireless/rtlwifi/rtl8723ae/hw.c                              |   13 
 drivers/net/wireless/rtlwifi/rtl8723be/hw.c                              |   17 
 drivers/net/wireless/rtlwifi/rtl8821ae/hw.c                              |   20 
 drivers/nfc/st21nfcb/i2c.c                                               |   10 
 drivers/nfc/st21nfcb/st21nfcb.c                                          |    3 
 drivers/of/address.c                                                     |    2 
 drivers/of/base.c                                                        |    2 
 drivers/phy/phy-berlin-usb.c                                             |    4 
 drivers/phy/phy-twl4030-usb.c                                            |    1 
 drivers/pinctrl/mvebu/pinctrl-armada-370.c                               |    4 
 drivers/pinctrl/mvebu/pinctrl-armada-375.c                               |    4 
 drivers/pinctrl/mvebu/pinctrl-armada-38x.c                               |   51 -
 drivers/pinctrl/mvebu/pinctrl-armada-39x.c                               |    2 
 drivers/pinctrl/mvebu/pinctrl-armada-xp.c                                |   37 
 drivers/pinctrl/pinctrl-zynq.c                                           |   11 
 drivers/platform/x86/dell-laptop.c                                       |    8 
 drivers/platform/x86/ideapad-laptop.c                                    |   10 
 drivers/pnp/system.c                                                     |   35 
 drivers/rtc/rtc-snvs.c                                                   |   30 
 drivers/staging/comedi/drivers/cb_pcimdas.c                              |    8 
 drivers/staging/rtl8712/rtl8712_recv.c                                   |    3 
 drivers/staging/vt6655/device_main.c                                     |    6 
 drivers/staging/vt6656/main_usb.c                                        |    2 
 drivers/tty/serial/Kconfig                                               |    2 
 drivers/tty/serial/atmel_serial.c                                        |    9 
 drivers/tty/sysrq.c                                                      |   19 
 drivers/usb/core/devio.c                                                 |    2 
 drivers/usb/core/hcd.c                                                   |    7 
 drivers/usb/core/hub.c                                                   |   84 --
 drivers/usb/core/usb.h                                                   |    1 
 drivers/usb/dwc3/ep0.c                                                   |    4 
 drivers/usb/dwc3/gadget.c                                                |   10 
 drivers/usb/gadget/composite.c                                           |   11 
 drivers/usb/gadget/function/f_fs.c                                       |    6 
 drivers/usb/gadget/function/f_mass_storage.c                             |   16 
 drivers/usb/gadget/udc/mv_udc_core.c                                     |    2 
 drivers/usb/host/ohci-q.c                                                |    7 
 drivers/usb/host/xhci-mem.c                                              |    2 
 drivers/usb/musb/musb_virthub.c                                          |    4 
 drivers/usb/phy/phy-mxs-usb.c                                            |    3 
 drivers/usb/serial/cp210x.c                                              |    1 
 drivers/usb/serial/option.c                                              |    1 
 drivers/usb/serial/usb-serial.c                                          |    1 
 drivers/w1/slaves/w1_therm.c                                             |   62 +
 drivers/watchdog/omap_wdt.c                                              |    7 
 fs/9p/vfs_inode.c                                                        |    3 
 fs/9p/vfs_inode_dotl.c                                                   |    3 
 fs/btrfs/inode-map.c                                                     |   17 
 fs/btrfs/ioctl.c                                                         |   22 
 fs/btrfs/transaction.c                                                   |    4 
 fs/btrfs/tree-log.c                                                      |   14 
 fs/ext4/extents.c                                                        |    6 
 fs/ext4/indirect.c                                                       |    2 
 fs/ext4/inode.c                                                          |   45 -
 fs/ext4/mballoc.c                                                        |   16 
 fs/ext4/migrate.c                                                        |   17 
 fs/ext4/super.c                                                          |    4 
 fs/fuse/inode.c                                                          |    2 
 fs/hpfs/super.c                                                          |   18 
 fs/jbd2/checkpoint.c                                                     |    7 
 fs/jbd2/journal.c                                                        |   38 
 fs/nfs/flexfilelayout/flexfilelayout.c                                   |    2 
 fs/nfs/flexfilelayout/flexfilelayoutdev.c                                |    7 
 fs/nfs/nfs3xdr.c                                                         |    2 
 fs/nfs/nfs4state.c                                                       |    2 
 fs/nfs/pnfs.c                                                            |    3 
 fs/nfs/write.c                                                           |    1 
 fs/overlayfs/readdir.c                                                   |   77 +
 fs/xfs/xfs_attr_inactive.c                                               |   10 
 fs/xfs/xfs_symlink.c                                                     |    2 
 include/acpi/acpixf.h                                                    |   13 
 include/acpi/actypes.h                                                   |    1 
 include/drm/drm_atomic.h                                                 |   24 
 include/drm/drm_crtc.h                                                   |    2 
 include/drm/drm_dp_mst_helper.h                                          |    4 
 include/linux/acpi.h                                                     |   10 
 include/linux/ata.h                                                      |    1 
 include/linux/buffer_head.h                                              |    7 
 include/linux/compiler-intel.h                                           |    2 
 include/linux/gpio/consumer.h                                            |   15 
 include/linux/hid-sensor-hub.h                                           |    1 
 include/linux/jbd2.h                                                     |    4 
 include/linux/libata.h                                                   |    3 
 include/linux/nfs_xdr.h                                                  |    2 
 include/linux/of.h                                                       |    5 
 include/uapi/drm/i915_drm.h                                              |    8 
 kernel/power/Kconfig                                                     |    2 
 kernel/printk/printk.c                                                   |   11 
 kernel/trace/trace.h                                                     |    3 
 kernel/trace/trace_branch.c                                              |   17 
 kernel/trace/trace_events_filter.c                                       |   10 
 lib/bitmap.c                                                             |   17 
 mm/hugetlb.c                                                             |   19 
 mm/memory.c                                                              |   20 
 net/9p/client.c                                                          |    4 
 net/bluetooth/hci_sock.c                                                 |   26 
 net/ceph/osdmap.c                                                        |    2 
 net/ieee802154/socket.c                                                  |    6 
 net/mac80211/cfg.c                                                       |    1 
 net/mac80211/ibss.c                                                      |    1 
 net/mac80211/main.c                                                      |    3 
 net/mac80211/mesh.c                                                      |    1 
 net/sunrpc/backchannel_rqst.c                                            |    2 
 net/wireless/util.c                                                      |    2 
 samples/trace_events/trace-events-sample.h                               |    7 
 security/integrity/evm/evm_main.c                                        |   11 
 security/integrity/ima/ima.h                                             |    2 
 security/integrity/ima/ima_fs.c                                          |    4 
 security/integrity/ima/ima_policy.c                                      |  124 ++-
 security/integrity/ima/ima_template_lib.c                                |    3 
 security/keys/keyring.c                                                  |    8 
 security/selinux/hooks.c                                                 |    3 
 security/selinux/ss/ebitmap.c                                            |    6 
 sound/soc/codecs/max98925.c                                              |    2 
 sound/soc/codecs/rt5645.c                                                |    4 
 sound/soc/codecs/tas2552.c                                               |    4 
 sound/soc/codecs/wm5102.c                                                |    2 
 sound/soc/codecs/wm5110.c                                                |    2 
 sound/soc/codecs/wm8737.c                                                |    6 
 sound/soc/codecs/wm8903.h                                                |    2 
 sound/soc/codecs/wm8955.c                                                |    2 
 sound/soc/codecs/wm8960.c                                                |    2 
 sound/soc/codecs/wm8997.c                                                |    2 
 sound/soc/fsl/imx-wm8962.c                                               |    2 
 sound/soc/omap/Kconfig                                                   |    5 
 sound/soc/qcom/Kconfig                                                   |    2 
 tools/perf/util/cloexec.c                                                |    4 
 284 files changed, 2886 insertions(+), 1989 deletions(-)

AMAN DEEP (1):
usb: xhci: Bugfix for NULL pointer deference in xhci_endpoint_init() function

Aaro Koskinen (1):
EDAC, octeon: Fix broken build due to model helper renames

Adriana Reus (1):
iio: inv-mpu: Specify the expected format/precision for write channels

Al Viro (3):
9p: forgetting to cancel request on interrupted zero-copy RPC 9p: don't leave a half-initialized inode sitting around p9_client_write(): avoid double p9_free_req()

Alan Stern (1):
USB: OHCI: Fix race between ED unlink and URB submission

Aleksei Mamlin (1):
libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for HP 250GB SATA disk VB0250EAVER

Aleksei Volkov (1):
Bluetooth: btusb: Correct typo in Roper Class 1 Bluetooth Dongle

Alex Deucher (6):
drm/radeon: take the mode_config mutex when dealing with hpds (v2) drm/radeon: clean up radeon_audio_enable
Revert "drm/radeon: dont switch vt on suspend" drm/radeon: only check the sink type on DP connectors drm/radeon: add a dpm quirk for Sapphire Radeon R9 270X 2GB GDDR5 drm/radeon/ci: silence a harmless PCC warning

Alexander Duyck (1):
e1000e: Cleanup handling of VLAN_HLEN as a part of max frame size

Alexander Sverdlin (3):
i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()
i2c: mux: pca954x: Use __i2c_transfer because of quirks
i2c: use parent adapter quirks in mux

Alexey Khoroshilov (1):
usb: gadget: mv_udc_core: fix phy_regs I/O memory leak

Andrew Morton (1):
openrisc: fix CONFIG_UID16 setting

Andrey Ryabinin (1):
drm/atomic: fix out of bounds read in for_each_*_in_state helpers

Arnd Bergmann (5):
ASoC: qcom: remove incorrect dependencies
ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency, again
serial: samsung: only use earlycon for console
tty: remove platform_sysrq_reset_seq
ideapad: fix software rfkill setting

Arne Fitzenreiter (2):
libata: add ATA_HORKAGE_NOTRIM
libata: force disable trim for SuperSSpeed S238

Axel Lin (4):
ASoC: max98925: Fix mask for setting DAI invert mode
ASoC: wm8737: Fixup setting VMID Impedance control register
ASoC: wm8955: Fix setting wrong register for WM8955_K_8_0_MASK bits
ASoC: wm8903: Fix define for WM8903_VMID_RES_250K

Boris Brezillon (1):
ARM: at91/dt: update udc compatible strings

Brian Foster (1):
xfs: don't truncate attribute extents if no extents exist

Chris Mason (1):
Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on Apple

Chris Metcalf (1):
__bitmap_parselist: fix bug in empty string handling

Chris Wilson (3):
drm/i915: Declare the swizzling unknown for L-shaped configurations drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls agp/intel: Fix typo in needs_ilk_vtd_wa()

Christian König (1):
drm/radeon: fix user ptr race condition

Christoffer Dall (1):
arm64: Don't report clear pmds and puds as huge

Christophe Ricard (2):
NFC: st21nfcb: Do not remove header once the payload is sent
NFC: st21nfcb: remove st21nfcb_nci_i2c_disable

Chuck Lever (1):
NFS: Fix size of NFSACL SETACL operations

Chun-Yeow Yeoh (1):
mac80211: fix the beacon csa counter for mesh and ibss

Claudio Cappelli (1):

      USB: option: add 2020:4000 ID

Colin Ian King (2):
KEYS: ensure we free the assoc array edit if edit is valid RDMA/ocrdma: fix double free on pd

Constantine Shulyupin (1):
hwmon: (nct7802) fix visibility of temp3

Cyrille Pitchen (1):
i2c: at91: fix a race condition when using the DMA controller

Damian Eppel (1):
clocksource: exynos_mct: Avoid blocking calls in the cpu hotplug notifier

Dan Carpenter (5):
ath9k_htc: memory corruption calling set_bit()
ASoC: imx-wm8962: Add a missing error check
USB: devio: fix a condition in async_completed()
ima: cleanup ima_init_policy() a little
ACPI / resources: free memory on error in add_region_before()

Daniel Baluta (2):
iio: ABI: Clarify proximity output value
iio: proximity: sx9500: Fix proximity value

Daniel Borkmann (1):
compiler-intel: fix wrong compiler barrier() macro

Daniel Kurtz (1):
drm/rockchip: use drm_gem_mmap helpers

Daniel Vetter (4):
drm/vgem: Set unique to "vgem"
drm/dp/mst: make sure mst_primary mstb is valid in work function Revert "drm/i915: Declare the swizzling unknown for L-shaped configurations"
drm: Stop resetting connector state to unknown

Darrick J. Wong (1):
ext4: don't retry file block mapping on bigalloc fs with non-extent file

Dave Airlie (2):
drm/dp/mst: close deadlock in connector destruction. drm/dp/mst: take lock around looking up the branch device on hpd irq

David Fries (1):
w1_therm reference count family data

David Härdeman (1):
rc-core: fix dib0700 scancode generation for RC5

David Milburn (1):
libata: add ATA_HORKAGE_MAX_SEC_1024 to revert back to previous max_sectors limit

Dennis Yang (1):
dm btree remove: fix bug in redistribute3

Ding Wang (1):
mmc: card: Fixup request missing in mmc_blk_issue_rw_rq

Dmitry Monakhov (1):
jbd2: use GFP_NOFS in jbd2_cleanup_journal_tail()

Dmitry Tunin (1):
ideapad_laptop: Lenovo G50-30 fix rfkill reports wireless blocked

Eliad Peller (1):
iwlwifi: mvm: fix ROC reference accounting

Eric Sandeen (1):
xfs: fix remote symlinks on V5/CRC filesystems

Eryu Guan (2):
ext4: be more strict when migrating to non-extent based file
ext4: correctly migrate a file with a hole at the beginning

Fabio Estevam (1):
iio: twl4030-madc: Pass the IRQF_ONESHOT flag

Felipe Balbi (2):
usb: dwc3: gadget: don't clear EP_BUSY too early
usb: musb: host: rely on port_mode to call musb_start()

Felix Fietkau (1):
ath9k: fix DMA stop sequence for AR9003+

Filipe Manana (6):
Btrfs: use kmem_cache_free when freeing entry in inode cache
Btrfs: fix race between caching kthread and returning inode to inode cache
Btrfs: fix fsync data loss after append write
Btrfs: fix memory leak in the extent_same ioctl
Btrfs: fix list transaction->pending_ordered corruption
Btrfs: fix file corruption after cloning inline extents

Firo Yang (2):
NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
md: fix a build warning

Frediano Ziglio (2):
drm/qxl: Do not cause spice-server to clean our objects drm/qxl: Do not leak memory if qxl_release_list_add fails

Geert Uytterhoeven (3):
drm/bridge: ptn3460: Include linux/gpio/consumer.h
PM / clk: Fix clock error check in __pm_clk_add()
gpiolib: Add missing dummies for the unified device properties interface

Goldwyn Rodrigues (1):
md: Skip cluster setup for dm-raid

Greg Kroah-Hartman (1):

      Linux 4.1.4

Greg Ungerer (2):
m68knommu: make ColdFire SoC selection a choice
m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire

Grigori Goronzy (2):
drm/radeon: fix HDP flushing
drm/radeon: unpin cursor BOs on suspend and pin them again on resume (v2)

Haggai Eran (1):
staging: rtl8712: prevent buffer overrun in recvbuf2recvframe

Hai Li (1):
clk: qcom: Use parent rate when set rate to pixel RCG clock

Hans Verkuil (2):
cx18: add missing caps for the PCM video device
saa7164: fix querycap warning

Hartmut Knaack (3):
iio:light:cm3323: clear bitmask before set iio:adc:cc10001_adc: fix Kconfig dependency iio:accel:bmc150-accel: fix counting direction

Heiko Stuebner (1):
iio: adc: rockchip_saradc: add missing MODULE_* data

Hon Ching \\(Vicky\\) Lo (1):
vTPM: set virtual device before passing to ibmvtpm_reset_crq

Ian Abbott (1):
staging: comedi: cb_pcimdas: fix handlers for DI and DO subdevices

Ilya Dryomov (2):
crush: fix a bug in tree bucket decode
rbd: use GFP_NOIO in rbd_obj_request_create()

JM Friedt (1):
iio: DAC: ad5624r_spi: fix bit shift of output data value

Jan Leupold (1):
iio: adc: at91_adc: allow to use full range of startup time

Jani Nikula (1):
drm/i915: fix backlight after resume on 855gm

Jarkko Sakkinen (2):
tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add() tpm, tpm_crb: fail when TPM2 ACPI table contents look corrupted

Jason Gunthorpe (1):
tpm: Fix initialization of the cdev

Jean Delvare (1):
firmware: dmi_scan: Only honor end-of-table for 64-bit tables

Jeff Layton (3):
nfs: increase size of EXCHANGE_ID name string buffer
nfs: fix potential credential leak in ff_layout_update_mirror_cred
nfs: always update creds in mirror, even when we have an already connected ds

Jiang Liu (1):
ACPI / PCI: Fix regressions caused by resource_size_t overflow with 32-bit kernel

Jingoo Han (1):
of/address: use atomic allocation in pci_register_io_range()

Joe Perches (1):
hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead

Joe Thornber (4):
dm cache: fix race when issuing a POLICY_REPLACE operation dm space map metadata: fix occasional leak of a metadata block on resize dm thin: allocate the cell_sort_array dynamically
dm btree: silence lockdep lock inversion in dm_btree_del()

Johannes Thumshirn (1):
USB: serial: Destroy serial_minors IDR on module exit

John Youn (1):
usb: dwc3: Reset the transfer resource index on SET_INTERFACE

Joseph Qi (1):
jbd2: fix ocfs2 corrupt when updating journal superblock fails

Jérôme Glisse (2):
drm/radeon: compute ring fix hibernation (CI GPU family) v2. drm/radeon: SDMA fix hibernation (CI GPU family).

Kirill A. Shutemov (2):
mm: avoid setting up anonymous pages into file mapping x86/mpx: Do not set ->vm_ops on MPX VMAs

Kishon Vijay Abraham I (1):
usb: gadget: composite: Fix NULL pointer dereference

Konstantin Khlebnikov (1):
of: return NUMA_NO_NODE from fallback of_node_to_nid()

Krzysztof Kozlowski (1):
clk: ti: dra7-atl-clock: Fix possible ERR_PTR dereference

Laurent Pinchart (1):
vb2: Don't WARN when v4l2_buffer.bytesused is 0 for multiplanar buffers

Lennert Buytenhek (1):
ieee802154: Fix sockaddr_ieee802154 implicit padding information leak.

Linus Torvalds (1):
Fix firmware loader uevent buffer NULL pointer dereference

Lior Amsalem (1):
dmaengine: mv_xor: bug fix for racing condition in descriptors cleanup

Lu Baolu (1):
usb: core: lpm: set lpm_capable for root hub device

Ludovic Desroches (1):
ARM: at91/dt: sama5d4ek: mci0 uses slot 0

Lukas Czerner (1):
ext4: fix reservation release on invalidatepage for delalloc fs

Lv Zheng (3):
ACPICA: Tables: Enable both 32-bit and 64-bit FACS
ACPICA: Tables: Fix an issue that FACS initialization is performed twice
ACPICA: Tables: Enable default 64-bit FADT addresses favor

Malcolm Priestley (3):
staging: vt6656: check ieee80211_bss_conf bssid not NULL
staging: vt6655: check ieee80211_bss_conf bssid not NULL
staging: vt6655: device_rx_srv check sk_buff is NULL

Marcel Holtmann (3):
Bluetooth: Fix race condition with user channel and setup stage
Bluetooth: btusb: Fix memory leak in Intel setup routine
Bluetooth: btusb: Fix secure send command length alignment on Intel 8260

Mario Kleiner (1):
drm/radeon: Handle irqs only based on irq ring, not irq status regs.

Martin K. Petersen (6):
libata: Do not blacklist Micron M500DC
libata: Fall back to unqueued READ LOG EXT if the DMA variant fails
libata: Expose TRIM capability in sysfs
libata: Do not blacklist M510DC
block: Do a full clone when splitting discard bios
libata: Fix regression when the NCQ Send and Receive log page is absent

Masahiro Yamada (2):
pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro
pinctrl: zynq: fix offset address for {SD0,SD1}_WP_CD_SEL

Mauro Carvalho Chehab (4):
cx24117: fix a buffer overflow when checking userspace params
af9013: Don't accept invalid bandwidth
s5h1420: fix a buffer overflow when checking userspace params
cx24116: fix a buffer overflow when checking userspace params

Michal Hocko (1):
ext4: replace open coded nofail allocation in ext4_free_blocks()

Michal Kazior (2):
cfg80211: ignore netif running state when changing iftype
mac80211: prevent possible crypto tx tailroom corruption

Michal Nazarewicz (1):
usb: f_mass_storage: limit number of reported LUNs

Michel Dänzer (2):
drm/radeon: Clean up reference counting and pinning of the cursor BOs drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL

Michel Thierry (1):
drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path

Miklos Szeredi (2):
fuse: initialize fc->release before calling it
ovl: lookup whiteouts outside iterate_dir()

Mikulas Patocka (2):
libata: increase the timeout when setting transfer mode dm stats: fix divide by zero if 'number_of_areas' arg is zero

Mimi Zohar (7):
KEYS: fix "ca_keys=" partial key matching
ima: do not measure or appraise the NSFS filesystem
evm: labeling pseudo filesystems exception
ima: fix ima_show_template_data_ascii()
ima: add support for new "euid" policy condition
ima: extend "mask" policy matching support
ima: update builtin policies

Ming Lei (2):
block: loop: convert to per-device workqueue
block: loop: avoiding too many pending per work I/O

Naoya Horiguchi (1):
mm/hugetlb: introduce minimum hugepage order

NeilBrown (3):
phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function.
md: clear mddev->private when it has been freed.
md: unlock mddev_lock on an error path.

Nicolas Boichat (1):
ASoC: rt5645: Init jack_detect_work before registering irq

Nicolas Ferre (2):
tty/serial: at91: RS485 mode: 0 is valid for delay_rts_after_send
ARM: at91/dt: trivial: fix USB udc compatible string

Nikolay Borisov (2):
bufferhead: Add _gfp version for sb_getblk()
ext4: avoid deadlocks in the writeback path by using sb_getblk_gfp

Olga Kornievskaia (1):
fixing infinite OPEN loop in 4.0 stateid recovery

Omar Sandoval (1):
Btrfs: don't invalidate root dentry when subvolume deletion fails

Pali Rohár (1):
dell-laptop: Fix allocating & freeing SMI buffer page

Paul Moore (1):
selinux: don't waste ebitmap space when importing NetLabel categories

Pawel Moll (1):

      bus: arm-ccn: Fix node->XP config conversion

Peter Meerwald (2):
iio: light: tcs3414: Fix bug preventing to set integration time
iio: tmp006: Check channel info on write

Peter Sanford (1):

      USB: cp210x: add ID for Aruba Networks controllers

Peter Ujfalusi (2):
ASoC: tas2552: Fix kernel crash when the codec is loaded but not part of a card
ASoC: tas2552: Fix kernel crash caused by wrong kcontrol entry

Rafael J. Wysocki (2):
ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage ACPI / LPSS: Fix up acpi_lpss_create_device()

Richard Fitzgerald (1):
ASoC: arizona: Fix noise generator gain TLV

Robert Schlabbach (1):
usb: core: Fix USB 3.0 devices lost in NOTATTACHED state after a hub port reset

Roberto Sassu (1):
ima: skip measurement of cgroupfs files and update documentation

Rodrigo Vivi (1):
drm/i915: Fix IPS related flicker

Rui Miguel Silva (1):

      usb: gadget: f_fs: do not set cancel function on synchronous {read,write}

Russell King (1):
ARM: dove: fix legacy dove IRQ numbers

Sanidhya Kashyap (1):
hpfs: kstrdup() out of memory handling

Srikar Dronamraju (1):
perf bench numa: Fix to show proper convergence stats

Srinivas Pandruvada (1):
hid-sensor: Fix suspend/resume delay

Stefan Agner (1):
rtc: snvs: fix wakealarm by call enable_irq_wake earlier

Stefan Wahren (3):
usb: phy: mxs: suspend to RAM causes NULL pointer dereference
ARM: dts: mx23: fix iio-hwmon support
clk: Fix JSON output in debugfs

Stephen Boyd (2):
ARM64: smp: Fix suspicious RCU usage with ipi tracepoints
ARM: 8393/1: smp: Fix suspicious RCU usage with ipi tracepoints

Stephen Smalley (1):
selinux: fix mprotect PROT_EXEC regression caused by mm change

Steven Rostedt (Red Hat) (5):
tracing/filter: Do not WARN on operand count going below zero tracing/filter: Do not allow infix to exceed end of string
tracing: Fix typo from "static inlin" to "static inline"
tracing: Have branch tracer use recursive field of task struct
tracing: Fix sample output of dynamic arrays

Stevens, Nick (1):
hwmon: (mcp3021) Fix broken output scaling

Subbaraya Sundeep Bhatta (2):
usb: dwc3: gadget: return error if command sent to DGCMD register fails
usb: dwc3: gadget: return error if command sent to DEPCMD register fails

Szabolcs Nagy (1):
ARM: 8397/1: fix vdsomunge not to depend on glibc specific error.h

Takashi Iwai (1):
PM / sleep: Increase default DPM watchdog timeout to 60

Theodore Ts'o (4):
ext4: fix race between truncate and __ext4_journalled_writepage()
ext4: call sync_blockdev() before invalidate_bdev() in put_super()
ext4: set lazytime on remount if MS_LAZYTIME is set by mount
ext4: fix fencepost error in lazytime optimization

Thierry Reding (1):
drm/tegra: dpaux: Fix transfers larger than 4 bytes

Thomas Hebb (1):
phy: berlin-usb: fix divider for BG2CD

Thomas Petazzoni (9):
pinctrl: mvebu: armada-370: fix spi0 pin description
pinctrl: mvebu: armada-375: remove incorrect space in pin description
pinctrl: mvebu: armada-375: remove non-existing NAND re/we pins
pinctrl: mvebu: armada-38x: fix PCIe functions
pinctrl: mvebu: armada-38x: fix incorrect total number of GPIOs
pinctrl: mvebu: armada-39x: fix incorrect total number of GPIOs
pinctrl: mvebu: armada-xp: remove non-existing NAND pins
pinctrl: mvebu: armada-xp: remove non-existing VDD cpu_pd functions
pinctrl: mvebu: armada-xp: fix functions of MPP48

Thomas Reitmayr (1):
media: Fix regression in some more dib0700 based devices

Tomas Elf (1):
drm/i915: Snapshot seqno of most recently submitted request.

Tomas Winkler (1):
mmc: block: Add missing mmc_blk_put() in power_ro_lock_show()

Trond Myklebust (4):
pNFS: Fix a memory leak when attempted pnfs fails pNFS/flexfiles: Fix the reset of struct pgio_header when resending
NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes
SUNRPC: Fix a memory leak in the backchannel code

Tvrtko Ursulin (2):
drm/i915: Forward all core DRM ioctls to core compat handling
drm: Provide compat ioctl for addfb2.1

Ulf Hansson (1):
mmc: sdhci: Restore behavior while creating OCR mask

Uwe Kleine-König (1):
watchdog: omap: assert the counter being stopped before reprogramming

Vasily Averin (1):
security_syslog() should be called once only

Vincent Fann (1):
rtlwifi: Remove the clear interrupt routine from all drivers

Xi Wang (2):
arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
arm64: bpf: fix endianness conversion bugs

Zhao Junwang (1):
drm: add a check for x/y in drm_mode_setcrtc

Zidan Wang (1):
ASoC: wm8960: the enum of "DAC Polarity" should be wm8960_enum[1]

[email protected] (1):
ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes

author maintainer
#1 lore raw
Documentation/ABI/testing/ima_policy +19 -7
index d0d0c578324c..0a378a88217a 100644
@@ -20,17 +20,19 @@ Description:
 		action: measure | dont_measure | appraise | dont_appraise | audit
 		condition:= base | lsm  [option]
 			base:	[[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]
-				 [fowner]]
+				[euid=] [fowner=]]
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]
 				 [obj_user=] [obj_role=] [obj_type=]]
 			option:	[[appraise_type=]] [permit_directio]
 
 		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
 				[FIRMWARE_CHECK]
-			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
+			mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
+			       [[^]MAY_EXEC]
 			fsmagic:= hex value
 			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
 			uid:= decimal value
+			euid:= decimal value
 			fowner:=decimal value
 		lsm:  	are LSM specific
 		option:	appraise_type:= [imasig]
@@ -49,11 +51,25 @@ Description:
 			dont_measure fsmagic=0x01021994
 			dont_appraise fsmagic=0x01021994
 			# RAMFS_MAGIC
-			dont_measure fsmagic=0x858458f6
 			dont_appraise fsmagic=0x858458f6
+			# DEVPTS_SUPER_MAGIC
+			dont_measure fsmagic=0x1cd1
+			dont_appraise fsmagic=0x1cd1
+			# BINFMTFS_MAGIC
+			dont_measure fsmagic=0x42494e4d
+			dont_appraise fsmagic=0x42494e4d
 			# SECURITYFS_MAGIC
 			dont_measure fsmagic=0x73636673
 			dont_appraise fsmagic=0x73636673
+			# SELINUX_MAGIC
+			dont_measure fsmagic=0xf97cff8c
+			dont_appraise fsmagic=0xf97cff8c
+			# CGROUP_SUPER_MAGIC
+			dont_measure fsmagic=0x27e0eb
+			dont_appraise fsmagic=0x27e0eb
+			# NSFS_MAGIC
+			dont_measure fsmagic=0x6e736673
+			dont_appraise fsmagic=0x6e736673
 
 			measure func=BPRM_CHECK
 			measure func=FILE_MMAP mask=MAY_EXEC
@@ -70,10 +86,6 @@ Description:
 		Examples of LSM specific definitions:
 
 		SELinux:
-			# SELINUX_MAGIC
-			dont_measure fsmagic=0xf97cff8c
-			dont_appraise fsmagic=0xf97cff8c
-
 			dont_measure obj_type=var_log_t
 			dont_appraise obj_type=var_log_t
 			dont_measure obj_type=auditd_log_t
Documentation/ABI/testing/sysfs-ata +11 -0
index 0a932155cbba..9231daef3813 100644
@@ -90,6 +90,17 @@ gscr
 	130:	SATA_PMP_GSCR_SII_GPIO
 	Only valid if the device is a PM.
 
+trim
+
+	Shows the DSM TRIM mode currently used by the device. Valid
+	values are:
+	unsupported:		Drive does not support DSM TRIM
+	unqueued:		Drive supports unqueued DSM TRIM only
+	queued:			Drive supports queued DSM TRIM
+	forced_unqueued:	Drive's unqueued DSM support is known to be
+				buggy and only unqueued TRIM commands
+				are sent
+
 spdn_cnt
 
 	Number of time libata decided to lower the speed of link due to errors.
Documentation/ABI/testing/sysfs-bus-iio +2 -4
index 3befcb19f414..1fbdd79d1624 100644
@@ -1165,10 +1165,8 @@ Description:
 		object is near the sensor, usually be observing
 		reflectivity of infrared or ultrasound emitted.
 		Often these sensors are unit less and as such conversion
-		to SI units is not possible.  Where it is, the units should
-		be meters.  If such a conversion is not possible, the reported
-		values should behave in the same way as a distance, i.e. lower
-		values indicate something is closer to the sensor.
+		to SI units is not possible. Higher proximity measurements
+		indicate closer objects, and vice versa.
 
 What:		/sys/.../iio:deviceX/in_illuminance_input
 What:		/sys/.../iio:deviceX/in_illuminance_raw
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +2 -2
index adda2a8d1d52..e357b020861d 100644
@@ -92,5 +92,5 @@ mpp61         61       gpo, dev(wen1), uart1(txd), audio(rclk)
 mpp62         62       gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),
                        audio(mclk), uart0(cts)
 mpp63         63       gpo, spi0(sck), tclk
-mpp64         64       gpio, spi0(miso), spi0-1(cs1)
-mpp65         65       gpio, spi0(mosi), spi0-1(cs2)
+mpp64         64       gpio, spi0(miso), spi0(cs1)
+mpp65         65       gpio, spi0(mosi), spi0(cs2)
Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt +2 -2
index 7de0cda4a379..bedbe42c8c0a 100644
@@ -22,8 +22,8 @@ mpp5          5        gpio, dev(ad7), spi0(cs2), spi1(cs2)
 mpp6          6        gpio, dev(ad0), led(p1), audio(rclk)
 mpp7          7        gpio, dev(ad1), ptp(clk), led(p2), audio(extclk)
 mpp8          8        gpio, dev (bootcs), spi0(cs0), spi1(cs0)
-mpp9          9        gpio, nf(wen), spi0(sck), spi1(sck)
-mpp10        10        gpio, nf(ren), dram(vttctrl), led(c1)
+mpp9          9        gpio, spi0(sck), spi1(sck), nand(we)
+mpp10        10        gpio, dram(vttctrl), led(c1), nand(re)
 mpp11        11        gpio, dev(a0), led(c2), audio(sdo)
 mpp12        12        gpio, dev(a1), audio(bclk)
 mpp13        13        gpio, dev(readyn), pcie0(rstoutn), pcie1(rstoutn)
Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt +19 -19
index b17c96849fc9..4ac138aaaf87 100644
@@ -27,15 +27,15 @@ mpp8          8        gpio, ge0(txd1), dev(ad10)
 mpp9          9        gpio, ge0(txd2), dev(ad11)
 mpp10         10       gpio, ge0(txd3), dev(ad12)
 mpp11         11       gpio, ge0(txctl), dev(ad13)
-mpp12         12       gpio, ge0(rxd0), pcie0(rstout), pcie1(rstout) [1], spi0(cs1), dev(ad14)
-mpp13         13       gpio, ge0(rxd1), pcie0(clkreq), pcie1(clkreq) [1], spi0(cs2), dev(ad15)
-mpp14         14       gpio, ge0(rxd2), ptp(clk), m(vtt_ctrl), spi0(cs3), dev(wen1)
-mpp15         15       gpio, ge0(rxd3), ge(mdc slave), pcie0(rstout), spi0(mosi), pcie1(rstout) [1]
-mpp16         16       gpio, ge0(rxctl), ge(mdio slave), m(decc_err), spi0(miso), pcie0(clkreq)
+mpp12         12       gpio, ge0(rxd0), pcie0(rstout), spi0(cs1), dev(ad14), pcie3(clkreq)
+mpp13         13       gpio, ge0(rxd1), pcie0(clkreq), pcie1(clkreq) [1], spi0(cs2), dev(ad15), pcie2(clkreq)
+mpp14         14       gpio, ge0(rxd2), ptp(clk), m(vtt_ctrl), spi0(cs3), dev(wen1), pcie3(clkreq)
+mpp15         15       gpio, ge0(rxd3), ge(mdc slave), pcie0(rstout), spi0(mosi)
+mpp16         16       gpio, ge0(rxctl), ge(mdio slave), m(decc_err), spi0(miso), pcie0(clkreq), pcie1(clkreq) [1]
 mpp17         17       gpio, ge0(rxclk), ptp(clk), ua1(rxd), spi0(sck), sata1(prsnt)
-mpp18         18       gpio, ge0(rxerr), ptp(trig_gen), ua1(txd), spi0(cs0), pcie1(rstout) [1]
-mpp19         19       gpio, ge0(col), ptp(event_req), pcie0(clkreq), sata1(prsnt), ua0(cts)
-mpp20         20       gpio, ge0(txclk), ptp(clk), pcie1(rstout) [1], sata0(prsnt), ua0(rts)
+mpp18         18       gpio, ge0(rxerr), ptp(trig_gen), ua1(txd), spi0(cs0)
+mpp19         19       gpio, ge0(col), ptp(event_req), ge0(txerr), sata1(prsnt), ua0(cts)
+mpp20         20       gpio, ge0(txclk), ptp(clk), sata0(prsnt), ua0(rts)
 mpp21         21       gpio, spi0(cs1), ge1(rxd0), sata0(prsnt), sd0(cmd), dev(bootcs)
 mpp22         22       gpio, spi0(mosi), dev(ad0)
 mpp23         23       gpio, spi0(sck), dev(ad2)
@@ -58,23 +58,23 @@ mpp39         39       gpio, i2c1(sck), ge1(rxd2), ua0(cts), sd0(d1), dev(a2)
 mpp40         40       gpio, i2c1(sda), ge1(rxd3), ua0(rts), sd0(d2), dev(ad6)
 mpp41         41       gpio, ua1(rxd), ge1(rxctl), ua0(cts), spi1(cs3), dev(burst/last)
 mpp42         42       gpio, ua1(txd), ua0(rts), dev(ad7)
-mpp43         43       gpio, pcie0(clkreq), m(vtt_ctrl), m(decc_err), pcie0(rstout), dev(clkout)
-mpp44         44       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [3], pcie0(rstout)
-mpp45         45       gpio, ref(clk_out0), pcie0(rstout), pcie1(rstout) [1], pcie2(rstout), pcie3(rstout)
-mpp46         46       gpio, ref(clk_out1), pcie0(rstout), pcie1(rstout) [1], pcie2(rstout), pcie3(rstout)
-mpp47         47       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], spi1(cs2), sata3(prsnt) [2]
-mpp48         48       gpio, sata0(prsnt), m(vtt_ctrl), tdm2c(pclk), audio(mclk), sd0(d4)
-mpp49         49       gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm2c(fsync), audio(lrclk), sd0(d5)
-mpp50         50       gpio, pcie0(rstout), pcie1(rstout) [1], tdm2c(drx), audio(extclk), sd0(cmd)
+mpp43         43       gpio, pcie0(clkreq), m(vtt_ctrl), m(decc_err), spi1(cs2), dev(clkout)
+mpp44         44       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [3]
+mpp45         45       gpio, ref(clk_out0), pcie0(rstout)
+mpp46         46       gpio, ref(clk_out1), pcie0(rstout)
+mpp47         47       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [2]
+mpp48         48       gpio, sata0(prsnt), m(vtt_ctrl), tdm2c(pclk), audio(mclk), sd0(d4), pcie0(clkreq)
+mpp49         49       gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm2c(fsync), audio(lrclk), sd0(d5), pcie1(clkreq)
+mpp50         50       gpio, pcie0(rstout), tdm2c(drx), audio(extclk), sd0(cmd)
 mpp51         51       gpio, tdm2c(dtx), audio(sdo), m(decc_err)
-mpp52         52       gpio, pcie0(rstout), pcie1(rstout) [1], tdm2c(intn), audio(sdi), sd0(d6)
+mpp52         52       gpio, pcie0(rstout), tdm2c(intn), audio(sdi), sd0(d6)
 mpp53         53       gpio, sata1(prsnt), sata0(prsnt), tdm2c(rstn), audio(bclk), sd0(d7)
-mpp54         54       gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), pcie1(rstout) [1], sd0(d3)
+mpp54         54       gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), ge0(txerr), sd0(d3)
 mpp55         55       gpio, ua1(cts), ge(mdio), pcie1(clkreq) [1], spi1(cs1), sd0(d0)
 mpp56         56       gpio, ua1(rts), ge(mdc), m(decc_err), spi1(mosi)
 mpp57         57       gpio, spi1(sck), sd0(clk)
 mpp58         58       gpio, pcie1(clkreq) [1], i2c1(sck), pcie2(clkreq), spi1(miso), sd0(d1)
-mpp59         59       gpio, pcie0(rstout), i2c1(sda), pcie1(rstout) [1], spi1(cs0), sd0(d2)
+mpp59         59       gpio, pcie0(rstout), i2c1(sda), spi1(cs0), sd0(d2)
 
 [1]: only available on 88F6820 and 88F6828
 [2]: only available on 88F6828
Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt +13 -19
index 373dbccd7ab0..96e7744cab84 100644
@@ -42,15 +42,15 @@ mpp20         20       gpio, ge0(rxd4), ge1(rxd2), lcd(d20), ptp(clk)
 mpp21         21       gpio, ge0(rxd5), ge1(rxd3), lcd(d21), mem(bat)
 mpp22         22       gpio, ge0(rxd6), ge1(rxctl), lcd(d22), sata0(prsnt)
 mpp23         23       gpio, ge0(rxd7), ge1(rxclk), lcd(d23), sata1(prsnt)
-mpp24         24       gpio, lcd(hsync), sata1(prsnt), nf(bootcs-re), tdm(rst)
-mpp25         25       gpio, lcd(vsync), sata0(prsnt), nf(bootcs-we), tdm(pclk)
-mpp26         26       gpio, lcd(clk), tdm(fsync), vdd(cpu1-pd)
+mpp24         24       gpio, lcd(hsync), sata1(prsnt), tdm(rst)
+mpp25         25       gpio, lcd(vsync), sata0(prsnt), tdm(pclk)
+mpp26         26       gpio, lcd(clk), tdm(fsync)
 mpp27         27       gpio, lcd(e), tdm(dtx), ptp(trig)
 mpp28         28       gpio, lcd(pwm), tdm(drx), ptp(evreq)
-mpp29         29       gpio, lcd(ref-clk), tdm(int0), ptp(clk), vdd(cpu0-pd)
+mpp29         29       gpio, lcd(ref-clk), tdm(int0), ptp(clk)
 mpp30         30       gpio, tdm(int1), sd0(clk)
-mpp31         31       gpio, tdm(int2), sd0(cmd), vdd(cpu0-pd)
-mpp32         32       gpio, tdm(int3), sd0(d0), vdd(cpu1-pd)
+mpp31         31       gpio, tdm(int2), sd0(cmd)
+mpp32         32       gpio, tdm(int3), sd0(d0)
 mpp33         33       gpio, tdm(int4), sd0(d1), mem(bat)
 mpp34         34       gpio, tdm(int5), sd0(d2), sata0(prsnt)
 mpp35         35       gpio, tdm(int6), sd0(d3), sata1(prsnt)
@@ -58,21 +58,18 @@ mpp36         36       gpio, spi(mosi)
 mpp37         37       gpio, spi(miso)
 mpp38         38       gpio, spi(sck)
 mpp39         39       gpio, spi(cs0)
-mpp40         40       gpio, spi(cs1), uart2(cts), lcd(vga-hsync), vdd(cpu1-pd),
-                       pcie(clkreq0)
+mpp40         40       gpio, spi(cs1), uart2(cts), lcd(vga-hsync), pcie(clkreq0)
 mpp41         41       gpio, spi(cs2), uart2(rts), lcd(vga-vsync), sata1(prsnt),
                        pcie(clkreq1)
-mpp42         42       gpio, uart2(rxd), uart0(cts), tdm(int7), tdm-1(timer),
-                       vdd(cpu0-pd)
-mpp43         43       gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout),
-                       vdd(cpu2-3-pd){1}
+mpp42         42       gpio, uart2(rxd), uart0(cts), tdm(int7), tdm-1(timer)
+mpp43         43       gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout)
 mpp44         44       gpio, uart2(cts), uart3(rxd), spi(cs4), pcie(clkreq2),
                        mem(bat)
 mpp45         45       gpio, uart2(rts), uart3(txd), spi(cs5), sata1(prsnt)
 mpp46         46       gpio, uart3(rts), uart1(rts), spi(cs6), sata0(prsnt)
 mpp47         47       gpio, uart3(cts), uart1(cts), spi(cs7), pcie(clkreq3),
                        ref(clkout)
-mpp48         48       gpio, tclk, dev(burst/last)
+mpp48         48       gpio, dev(clkout), dev(burst/last)
 
 * Marvell Armada XP (mv78260 and mv78460 only)
 
@@ -84,9 +81,9 @@ mpp51         51       gpio, dev(ad16)
 mpp52         52       gpio, dev(ad17)
 mpp53         53       gpio, dev(ad18)
 mpp54         54       gpio, dev(ad19)
-mpp55         55       gpio, dev(ad20), vdd(cpu0-pd)
-mpp56         56       gpio, dev(ad21), vdd(cpu1-pd)
-mpp57         57       gpio, dev(ad22), vdd(cpu2-3-pd){1}
+mpp55         55       gpio, dev(ad20)
+mpp56         56       gpio, dev(ad21)
+mpp57         57       gpio, dev(ad22)
 mpp58         58       gpio, dev(ad23)
 mpp59         59       gpio, dev(ad24)
 mpp60         60       gpio, dev(ad25)
@@ -96,6 +93,3 @@ mpp63         63       gpio, dev(ad28)
 mpp64         64       gpio, dev(ad29)
 mpp65         65       gpio, dev(ad30)
 mpp66         66       gpio, dev(ad31)
-
-Notes:
-* {1} vdd(cpu2-3-pd) only available on mv78460.
Documentation/devicetree/bindings/usb/atmel-usb.txt +3 -3
index e180d56c75db..de773a00e2d4 100644
@@ -60,9 +60,9 @@ Atmel High-Speed USB device controller
 
 Required properties:
  - compatible: Should be one of the following
-	       "at91sam9rl-udc"
-	       "at91sam9g45-udc"
-	       "sama5d3-udc"
+	       "atmel,at91sam9rl-udc"
+	       "atmel,at91sam9g45-udc"
+	       "atmel,sama5d3-udc"
  - reg: Address and length of the register set for the device
  - interrupts: Should contain usba interrupt
  - ep childnode: To specify the number of endpoints and their properties.
Documentation/kernel-parameters.txt +9 -1
index 6726139bd289..cd03a0faca8f 100644
@@ -1398,7 +1398,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			The list of supported hash algorithms is defined
 			in crypto/hash_info.h.
 
-	ima_tcb		[IMA]
+	ima_policy=	[IMA]
+			The builtin measurement policy to load during IMA
+			setup.  Specyfing "tcb" as the value, measures all
+			programs exec'd, files mmap'd for exec, and all files
+			opened with the read mode bit set by either the
+			effective uid (euid=0) or uid=0.
+			Format: "tcb"
+
+	ima_tcb		[IMA] Deprecated.  Use ima_policy= instead.
 			Load a policy which meets the needs of the Trusted
 			Computing Base.  This means IMA will measure all
 			programs exec'd, files mmap'd for exec, and all files
Makefile +1 -1
index e3cdec4898be..36f3225cdf1f 100644
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 1
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME = Series 4800
 
arch/arm/boot/dts/at91-sama5d4ek.dts +2 -2
index 89ef4a540db5..45e7761b7a29 100644
@@ -108,8 +108,8 @@
 			mmc0: mmc@f8000000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>;
-				slot@1 {
-					reg = <1>;
+				slot@0 {
+					reg = <0>;
 					bus-width = <4>;
 					cd-gpios = <&pioE 5 0>;
 				};
arch/arm/boot/dts/at91sam9g45.dtsi +1 -1
index 70e59c5ceb2f..e54421176af8 100644
@@ -1148,7 +1148,7 @@
 			usb2: gadget@fff78000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
-				compatible = "atmel,at91sam9rl-udc";
+				compatible = "atmel,at91sam9g45-udc";
 				reg = <0x00600000 0x80000
 				       0xfff78000 0x400>;
 				interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
arch/arm/boot/dts/at91sam9x5.dtsi +1 -1
index 3aa56ae3410a..3314a7303754 100644
@@ -1062,7 +1062,7 @@
 			usb2: gadget@f803c000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
-				compatible = "atmel,at91sam9rl-udc";
+				compatible = "atmel,at91sam9g45-udc";
 				reg = <0x00500000 0x80000
 				       0xf803c000 0x400>;
 				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
arch/arm/boot/dts/imx23.dtsi +1 -0
index bbcfb5a19c77..0cb8b0b11c3f 100644
@@ -435,6 +435,7 @@
 				interrupts = <36 37 38 39 40 41 42 43 44>;
 				status = "disabled";
 				clocks = <&clks 26>;
+				#io-channel-cells = <1>;
 			};
 
 			spdif@80054000 {
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 57ab8587f7b9..37e6182f1470 100644
@@ -1321,7 +1321,7 @@
 		usb0: gadget@00500000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			compatible = "atmel,at91sam9rl-udc";
+			compatible = "atmel,sama5d3-udc";
 			reg = <0x00500000 0x100000
 			       0xf8030000 0x4000>;
 			interrupts = <33 IRQ_TYPE_LEVEL_HIGH 2>;
arch/arm/boot/dts/sama5d4.dtsi +11 -11
index 6b1bb58f9c0b..a5f5f4090af6 100644
@@ -123,7 +123,7 @@
 		usb0: gadget@00400000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			compatible = "atmel,at91sam9rl-udc";
+			compatible = "atmel,sama5d3-udc";
 			reg = <0x00400000 0x100000
 			       0xfc02c000 0x4000>;
 			interrupts = <47 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -1125,10 +1125,10 @@
 				compatible = "atmel,at91sam9g46-aes";
 				reg = <0xfc044000 0x100>;
 				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
-					AT91_XDMAC_DT_PERID(41)>,
-				       <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
-					AT91_XDMAC_DT_PERID(40)>;
+				dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(41))>,
+				       <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(40))>;
 				dma-names = "tx", "rx";
 				clocks = <&aes_clk>;
 				clock-names = "aes_clk";
@@ -1139,10 +1139,10 @@
 				compatible = "atmel,at91sam9g46-tdes";
 				reg = <0xfc04c000 0x100>;
 				interrupts = <14 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
-					AT91_XDMAC_DT_PERID(42)>,
-				       <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
-					AT91_XDMAC_DT_PERID(43)>;
+				dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(42))>,
+				       <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(43))>;
 				dma-names = "tx", "rx";
 				clocks = <&tdes_clk>;
 				clock-names = "tdes_clk";
@@ -1153,8 +1153,8 @@
 				compatible = "atmel,at91sam9g46-sha";
 				reg = <0xfc050000 0x100>;
 				interrupts = <15 IRQ_TYPE_LEVEL_HIGH 0>;
-				dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1))
-					AT91_XDMAC_DT_PERID(44)>;
+				dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(44))>;
 				dma-names = "tx";
 				clocks = <&sha_clk>;
 				clock-names = "sha_clk";
arch/arm/kernel/smp.c +2 -2
index cca5b8758185..f11d82527076 100644
@@ -576,7 +576,7 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 	struct pt_regs *old_regs = set_irq_regs(regs);
 
 	if ((unsigned)ipinr < NR_IPI) {
-		trace_ipi_entry(ipi_types[ipinr]);
+		trace_ipi_entry_rcuidle(ipi_types[ipinr]);
 		__inc_irq_stat(cpu, ipi_irqs[ipinr]);
 	}
 
@@ -635,7 +635,7 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 	}
 
 	if ((unsigned)ipinr < NR_IPI)
-		trace_ipi_exit(ipi_types[ipinr]);
+		trace_ipi_exit_rcuidle(ipi_types[ipinr]);
 	set_irq_regs(old_regs);
 }
 
arch/arm/mach-dove/include/mach/irqs.h +59 -59

132 lines not on this page · raw message

arch/arm/mach-dove/irq.c +4 -4
index 4a5a7aedcb76..df0223f76fa9 100644
@@ -126,14 +126,14 @@ __exception_irq_entry dove_legacy_handle_irq(struct pt_regs *regs)
 	stat = readl_relaxed(dove_irq_base + IRQ_CAUSE_LOW_OFF);
 	stat &= readl_relaxed(dove_irq_base + IRQ_MASK_LOW_OFF);
 	if (stat) {
-		unsigned int hwirq = __fls(stat);
+		unsigned int hwirq = 1 + __fls(stat);
 		handle_IRQ(hwirq, regs);
 		return;
 	}
 	stat = readl_relaxed(dove_irq_base + IRQ_CAUSE_HIGH_OFF);
 	stat &= readl_relaxed(dove_irq_base + IRQ_MASK_HIGH_OFF);
 	if (stat) {
-		unsigned int hwirq = 32 + __fls(stat);
+		unsigned int hwirq = 33 + __fls(stat);
 		handle_IRQ(hwirq, regs);
 		return;
 	}
@@ -144,8 +144,8 @@ void __init dove_init_irq(void)
 {
 	int i;
 
-	orion_irq_init(0, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF);
-	orion_irq_init(32, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF);
+	orion_irq_init(1, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF);
+	orion_irq_init(33, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF);
 
 #ifdef CONFIG_MULTI_IRQ_HANDLER
 	set_handle_irq(dove_legacy_handle_irq);
arch/arm/vdso/vdsomunge.c +33 -23

132 lines not on this page · raw message

arch/arm64/kernel/smp.c +2 -2
index 2cb008177252..d3a202b85ba6 100644
@@ -569,7 +569,7 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 	struct pt_regs *old_regs = set_irq_regs(regs);
 
 	if ((unsigned)ipinr < NR_IPI) {
-		trace_ipi_entry(ipi_types[ipinr]);
+		trace_ipi_entry_rcuidle(ipi_types[ipinr]);
 		__inc_irq_stat(cpu, ipi_irqs[ipinr]);
 	}
 
@@ -612,7 +612,7 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 	}
 
 	if ((unsigned)ipinr < NR_IPI)
-		trace_ipi_exit(ipi_types[ipinr]);
+		trace_ipi_exit_rcuidle(ipi_types[ipinr]);
 	set_irq_regs(old_regs);
 }
 
arch/arm64/mm/hugetlbpage.c +2 -2
index 2de9d2e59d96..0eeb4f0930a0 100644
@@ -40,13 +40,13 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
 
 int pmd_huge(pmd_t pmd)
 {
-	return !(pmd_val(pmd) & PMD_TABLE_BIT);
+	return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
 }
 
 int pud_huge(pud_t pud)
 {
 #ifndef __PAGETABLE_PMD_FOLDED
-	return !(pud_val(pud) & PUD_TABLE_BIT);
+	return pud_val(pud) && !(pud_val(pud) & PUD_TABLE_BIT);
 #else
 	return 0;
 #endif
arch/arm64/net/bpf_jit.h +4 -0
index de0a81a539a0..98a26ce82d26 100644
@@ -110,6 +110,10 @@
 /* Rd = Rn >> shift; signed */
 #define A64_ASR(sf, Rd, Rn, shift) A64_SBFM(sf, Rd, Rn, shift, (sf) ? 63 : 31)
 
+/* Zero extend */
+#define A64_UXTH(sf, Rd, Rn) A64_UBFM(sf, Rd, Rn, 0, 15)
+#define A64_UXTW(sf, Rd, Rn) A64_UBFM(sf, Rd, Rn, 0, 31)
+
 /* Move wide (immediate) */
 #define A64_MOVEW(sf, Rd, imm16, shift, type) \
 	aarch64_insn_gen_movewide(Rd, imm16, shift, \
arch/arm64/net/bpf_jit_comp.c +24 -5
index dc6a4842683a..c047598b09e0 100644
@@ -113,9 +113,9 @@ static inline void emit_a64_mov_i(const int is64, const int reg,
 static inline int bpf2a64_offset(int bpf_to, int bpf_from,
 				 const struct jit_ctx *ctx)
 {
-	int to = ctx->offset[bpf_to + 1];
+	int to = ctx->offset[bpf_to];
 	/* -1 to account for the Branch instruction */
-	int from = ctx->offset[bpf_from + 1] - 1;
+	int from = ctx->offset[bpf_from] - 1;
 
 	return to - from;
 }
@@ -289,23 +289,41 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
 	case BPF_ALU | BPF_END | BPF_FROM_BE:
 #ifdef CONFIG_CPU_BIG_ENDIAN
 		if (BPF_SRC(code) == BPF_FROM_BE)
-			break;
+			goto emit_bswap_uxt;
 #else /* !CONFIG_CPU_BIG_ENDIAN */
 		if (BPF_SRC(code) == BPF_FROM_LE)
-			break;
+			goto emit_bswap_uxt;
 #endif
 		switch (imm) {
 		case 16:
 			emit(A64_REV16(is64, dst, dst), ctx);
+			/* zero-extend 16 bits into 64 bits */
+			emit(A64_UXTH(is64, dst, dst), ctx);
 			break;
 		case 32:
 			emit(A64_REV32(is64, dst, dst), ctx);
+			/* upper 32 bits already cleared */
 			break;
 		case 64:
 			emit(A64_REV64(dst, dst), ctx);
 			break;
 		}
 		break;
+emit_bswap_uxt:
+		switch (imm) {
+		case 16:
+			/* zero-extend 16 bits into 64 bits */
+			emit(A64_UXTH(is64, dst, dst), ctx);
+			break;
+		case 32:
+			/* zero-extend 32 bits into 64 bits */
+			emit(A64_UXTW(is64, dst, dst), ctx);
+			break;
+		case 64:
+			/* nop */
+			break;
+		}
+		break;
 	/* dst = imm */
 	case BPF_ALU | BPF_MOV | BPF_K:
 	case BPF_ALU64 | BPF_MOV | BPF_K:
@@ -640,10 +658,11 @@ static int build_body(struct jit_ctx *ctx)
 		const struct bpf_insn *insn = &prog->insnsi[i];
 		int ret;
 
+		ret = build_insn(insn, ctx);
+
 		if (ctx->image == NULL)
 			ctx->offset[i] = ctx->idx;
 
-		ret = build_insn(insn, ctx);
 		if (ret > 0) {
 			i++;
 			continue;
arch/m68k/Kconfig.cpu +19 -22

80 lines not on this page · raw message

arch/m68k/include/asm/coldfire.h +1 -1
index c94557b91448..50aa4dac9ca2 100644
@@ -19,7 +19,7 @@
  *	in any case new boards come along from time to time that have yet
  *	another different clocking frequency.
  */
-#ifdef CONFIG_CLOCK_SET
+#ifdef CONFIG_CLOCK_FREQ
 #define	MCF_CLK		CONFIG_CLOCK_FREQ
 #else
 #error "Don't know what your ColdFire CPU clock frequency is??"
arch/openrisc/Kconfig +1 -3
index e5a693b16da2..443f44de1020 100644
@@ -17,6 +17,7 @@ config OPENRISC
 	select GENERIC_IRQ_SHOW
 	select GENERIC_IOMAP
 	select GENERIC_CPU_DEVICES
+	select HAVE_UID16
 	select GENERIC_ATOMIC64
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_STRNCPY_FROM_USER
@@ -31,9 +32,6 @@ config MMU
 config HAVE_DMA_ATTRS
 	def_bool y
 
-config UID16
-	def_bool y
-
 config RWSEM_GENERIC_SPINLOCK
 	def_bool y
 
arch/x86/mm/mmap.c +7 -0
index 9d518d693b4b..844b06d67df4 100644
@@ -126,3 +126,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
 	}
 }
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+	if (vma->vm_flags & VM_MPX)
+		return "[mpx]";
+	return NULL;
+}
arch/x86/mm/mpx.c +1 -19
index c439ec478216..4d1c11c07fe1 100644
@@ -18,26 +18,9 @@
 #include <asm/processor.h>
 #include <asm/fpu-internal.h>
 
-static const char *mpx_mapping_name(struct vm_area_struct *vma)
-{
-	return "[mpx]";
-}
-
-static struct vm_operations_struct mpx_vma_ops = {
-	.name = mpx_mapping_name,
-};
-
-static int is_mpx_vma(struct vm_area_struct *vma)
-{
-	return (vma->vm_ops == &mpx_vma_ops);
-}
-
 /*
  * This is really a simplified "vm_mmap". it only handles MPX
  * bounds tables (the bounds directory is user-allocated).
- *
- * Later on, we use the vma->vm_ops to uniquely identify these
- * VMAs.
  */
 static unsigned long mpx_mmap(unsigned long len)
 {
@@ -83,7 +66,6 @@ static unsigned long mpx_mmap(unsigned long len)
 		ret = -ENOMEM;
 		goto out;
 	}
-	vma->vm_ops = &mpx_vma_ops;
 
 	if (vm_flags & VM_LOCKED) {
 		up_write(&mm->mmap_sem);
@@ -661,7 +643,7 @@ static int zap_bt_entries(struct mm_struct *mm,
 		 * so stop immediately and return an error.  This
 		 * probably results in a SIGSEGV.
 		 */
-		if (!is_mpx_vma(vma))
+		if (!(vma->vm_flags & VM_MPX))
 			return -EINVAL;
 
 		len = min(vma->vm_end, end) - addr;
block/bio.c +12 -3
index f66a4eae16ee..4441522ca339 100644
@@ -1814,8 +1814,9 @@ EXPORT_SYMBOL(bio_endio_nodec);
  * Allocates and returns a new bio which represents @sectors from the start of
  * @bio, and updates @bio to represent the remaining sectors.
  *
- * The newly allocated bio will point to @bio's bi_io_vec; it is the caller's
- * responsibility to ensure that @bio is not freed before the split.
+ * Unless this is a discard request the newly allocated bio will point
+ * to @bio's bi_io_vec; it is the caller's responsibility to ensure that
+ * @bio is not freed before the split.
  */
 struct bio *bio_split(struct bio *bio, int sectors,
 		      gfp_t gfp, struct bio_set *bs)
@@ -1825,7 +1826,15 @@ struct bio *bio_split(struct bio *bio, int sectors,
 	BUG_ON(sectors <= 0);
 	BUG_ON(sectors >= bio_sectors(bio));
 
-	split = bio_clone_fast(bio, gfp, bs);
+	/*
+	 * Discards need a mutable bio_vec to accommodate the payload
+	 * required by the DSM TRIM and UNMAP commands.
+	 */
+	if (bio->bi_rw & REQ_DISCARD)
+		split = bio_clone_bioset(bio, gfp, bs);
+	else
+		split = bio_clone_fast(bio, gfp, bs);
+
 	if (!split)
 		return NULL;
 
crypto/asymmetric_keys/asymmetric_keys.h +3 -0
index f97330886d58..3f5b537ab33e 100644
@@ -11,6 +11,9 @@
 
 extern struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id);
 
+extern int __asymmetric_key_hex_to_key_id(const char *id,
+					  struct asymmetric_key_id *match_id,
+					  size_t hexlen);
 static inline
 const struct asymmetric_key_ids *asymmetric_key_ids(const struct key *key)
 {
crypto/asymmetric_keys/asymmetric_type.c +14 -6
index bcbbbd794e1d..b0e4ed23d668 100644
@@ -104,6 +104,15 @@ static bool asymmetric_match_key_ids(
 	return false;
 }
 
+/* helper function can be called directly with pre-allocated memory */
+inline int __asymmetric_key_hex_to_key_id(const char *id,
+				   struct asymmetric_key_id *match_id,
+				   size_t hexlen)
+{
+	match_id->len = hexlen;
+	return hex2bin(match_id->data, id, hexlen);
+}
+
 /**
  * asymmetric_key_hex_to_key_id - Convert a hex string into a key ID.
  * @id: The ID as a hex string.
@@ -111,21 +120,20 @@ static bool asymmetric_match_key_ids(
 struct asymmetric_key_id *asymmetric_key_hex_to_key_id(const char *id)
 {
 	struct asymmetric_key_id *match_id;
-	size_t hexlen;
+	size_t asciihexlen;
 	int ret;
 
 	if (!*id)
 		return ERR_PTR(-EINVAL);
-	hexlen = strlen(id);
-	if (hexlen & 1)
+	asciihexlen = strlen(id);
+	if (asciihexlen & 1)
 		return ERR_PTR(-EINVAL);
 
-	match_id = kmalloc(sizeof(struct asymmetric_key_id) + hexlen / 2,
+	match_id = kmalloc(sizeof(struct asymmetric_key_id) + asciihexlen / 2,
 			   GFP_KERNEL);
 	if (!match_id)
 		return ERR_PTR(-ENOMEM);
-	match_id->len = hexlen / 2;
-	ret = hex2bin(match_id->data, id, hexlen / 2);
+	ret = __asymmetric_key_hex_to_key_id(id, match_id, asciihexlen / 2);
 	if (ret < 0) {
 		kfree(match_id);
 		return ERR_PTR(-EINVAL);
crypto/asymmetric_keys/x509_public_key.c +18 -5
index a6c42031628e..24f17e6c5904 100644
@@ -28,17 +28,30 @@ static bool use_builtin_keys;
 static struct asymmetric_key_id *ca_keyid;
 
 #ifndef MODULE
+static struct {
+	struct asymmetric_key_id id;
+	unsigned char data[10];
+} cakey;
+
 static int __init ca_keys_setup(char *str)
 {
 	if (!str)		/* default system keyring */
 		return 1;
 
 	if (strncmp(str, "id:", 3) == 0) {
-		struct asymmetric_key_id *p;
-		p = asymmetric_key_hex_to_key_id(str + 3);
-		if (p == ERR_PTR(-EINVAL))
-			pr_err("Unparsable hex string in ca_keys\n");
-		else if (!IS_ERR(p))
+		struct asymmetric_key_id *p = &cakey.id;
+		size_t hexlen = (strlen(str) - 3) / 2;
+		int ret;
+
+		if (hexlen == 0 || hexlen > sizeof(cakey.data)) {
+			pr_err("Missing or invalid ca_keys id\n");
+			return 1;
+		}
+
+		ret = __asymmetric_key_hex_to_key_id(str + 3, p, hexlen);
+		if (ret < 0)
+			pr_err("Unparsable ca_keys id hex string\n");
+		else
 			ca_keyid = p;	/* owner key 'id:xxxxxx' */
 	} else if (strcmp(str, "builtin") == 0) {
 		use_builtin_keys = true;
drivers/acpi/acpi_lpss.c +5 -2
index 37fb19047603..73f056a597a9 100644
@@ -352,13 +352,16 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
 				pdata->mmio_size = resource_size(rentry->res);
 			pdata->mmio_base = ioremap(rentry->res->start,
 						   pdata->mmio_size);
-			if (!pdata->mmio_base)
-				goto err_out;
 			break;
 		}
 
 	acpi_dev_free_resource_list(&resource_list);
 
+	if (!pdata->mmio_base) {
+		ret = -ENOMEM;
+		goto err_out;
+	}
+
 	pdata->dev_desc = dev_desc;
 
 	if (dev_desc->setup)
drivers/acpi/acpica/aclocal.h +1 -0
index 87b27521fcac..7f50dd9eb1d0 100644
@@ -213,6 +213,7 @@ struct acpi_table_list {
 
 #define ACPI_TABLE_INDEX_DSDT           (0)
 #define ACPI_TABLE_INDEX_FACS           (1)
+#define ACPI_TABLE_INDEX_X_FACS         (2)
 
 struct acpi_find_context {
 	char *search_for;
drivers/acpi/acpica/tbfadt.c +13 -8
index 7d2486005e3f..05be59c772c7 100644
@@ -350,9 +350,18 @@ void acpi_tb_parse_fadt(u32 table_index)
 	/* If Hardware Reduced flag is set, there is no FACS */
 
 	if (!acpi_gbl_reduced_hardware) {
-		acpi_tb_install_fixed_table((acpi_physical_address)
-					    acpi_gbl_FADT.Xfacs, ACPI_SIG_FACS,
-					    ACPI_TABLE_INDEX_FACS);
+		if (acpi_gbl_FADT.facs) {
+			acpi_tb_install_fixed_table((acpi_physical_address)
+						    acpi_gbl_FADT.facs,
+						    ACPI_SIG_FACS,
+						    ACPI_TABLE_INDEX_FACS);
+		}
+		if (acpi_gbl_FADT.Xfacs) {
+			acpi_tb_install_fixed_table((acpi_physical_address)
+						    acpi_gbl_FADT.Xfacs,
+						    ACPI_SIG_FACS,
+						    ACPI_TABLE_INDEX_X_FACS);
+		}
 	}
 }
 
@@ -491,13 +500,9 @@ static void acpi_tb_convert_fadt(void)
 	acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
 
 	/*
-	 * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary.
+	 * Expand the 32-bit DSDT addresses to 64-bit as necessary.
 	 * Later ACPICA code will always use the X 64-bit field.
 	 */
-	acpi_gbl_FADT.Xfacs = acpi_tb_select_address("FACS",
-						     acpi_gbl_FADT.facs,
-						     acpi_gbl_FADT.Xfacs);
-
 	acpi_gbl_FADT.Xdsdt = acpi_tb_select_address("DSDT",
 						     acpi_gbl_FADT.dsdt,
 						     acpi_gbl_FADT.Xdsdt);
drivers/acpi/acpica/tbutils.c +23 -11
index 6559a58439c5..2fb1afaacc6d 100644
@@ -68,7 +68,8 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size);
 
 acpi_status acpi_tb_initialize_facs(void)
 {
-	acpi_status status;
+	struct acpi_table_facs *facs32;
+	struct acpi_table_facs *facs64;
 
 	/* If Hardware Reduced flag is set, there is no FACS */
 
@@ -77,11 +78,22 @@ acpi_status acpi_tb_initialize_facs(void)
 		return (AE_OK);
 	}
 
-	status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
-					 ACPI_CAST_INDIRECT_PTR(struct
-								acpi_table_header,
-								&acpi_gbl_FACS));
-	return (status);
+	(void)acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS,
+				      ACPI_CAST_INDIRECT_PTR(struct
+							     acpi_table_header,
+							     &facs32));
+	(void)acpi_get_table_by_index(ACPI_TABLE_INDEX_X_FACS,
+				      ACPI_CAST_INDIRECT_PTR(struct
+							     acpi_table_header,
+							     &facs64));
+
+	if (acpi_gbl_use32_bit_facs_addresses) {
+		acpi_gbl_FACS = facs32 ? facs32 : facs64;
+	} else {
+		acpi_gbl_FACS = facs64 ? facs64 : facs32;
+	}
+
+	return (AE_OK);
 }
 #endif				/* !ACPI_REDUCED_HARDWARE */
 
@@ -101,7 +113,7 @@ acpi_status acpi_tb_initialize_facs(void)
 u8 acpi_tb_tables_loaded(void)
 {
 
-	if (acpi_gbl_root_table_list.current_table_count >= 3) {
+	if (acpi_gbl_root_table_list.current_table_count >= 4) {
 		return (TRUE);
 	}
 
@@ -357,11 +369,11 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
 	table_entry = ACPI_ADD_PTR(u8, table, sizeof(struct acpi_table_header));
 
 	/*
-	 * First two entries in the table array are reserved for the DSDT
-	 * and FACS, which are not actually present in the RSDT/XSDT - they
-	 * come from the FADT
+	 * First three entries in the table array are reserved for the DSDT
+	 * and 32bit/64bit FACS, which are not actually present in the
+	 * RSDT/XSDT - they come from the FADT
 	 */
-	acpi_gbl_root_table_list.current_table_count = 2;
+	acpi_gbl_root_table_list.current_table_count = 3;
 
 	/* Initialize the root table array from the RSDT/XSDT */
 
drivers/acpi/acpica/tbxfload.c +2 -1
index aadb3002a2dd..b63e35d6d1bf 100644
@@ -166,7 +166,8 @@ static acpi_status acpi_tb_load_namespace(void)
 
 	(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);
 	for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
-		if ((!ACPI_COMPARE_NAME
+		if (!acpi_gbl_root_table_list.tables[i].address ||
+		    (!ACPI_COMPARE_NAME
 		     (&(acpi_gbl_root_table_list.tables[i].signature),
 		      ACPI_SIG_SSDT)
 		     &&
drivers/acpi/acpica/utxfinit.c +6 -4
index 083a76891889..42a32a66ef22 100644
@@ -179,10 +179,12 @@ acpi_status __init acpi_enable_subsystem(u32 flags)
 	 * Obtain a permanent mapping for the FACS. This is required for the
 	 * Global Lock and the Firmware Waking Vector
 	 */
-	status = acpi_tb_initialize_facs();
-	if (ACPI_FAILURE(status)) {
-		ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
-		return_ACPI_STATUS(status);
+	if (!(flags & ACPI_NO_FACS_INIT)) {
+		status = acpi_tb_initialize_facs();
+		if (ACPI_FAILURE(status)) {
+			ACPI_WARNING((AE_INFO, "Could not map the FACS table"));
+			return_ACPI_STATUS(status);
+		}
 	}
 #endif				/* !ACPI_REDUCED_HARDWARE */
 
drivers/acpi/osl.c +9 -3
index 5226a8b921ae..98f5316aad72 100644
@@ -175,10 +175,14 @@ static void __init acpi_request_region (struct acpi_generic_address *gas,
 	if (!addr || !length)
 		return;
 
-	acpi_reserve_region(addr, length, gas->space_id, 0, desc);
+	/* Resources are never freed */
+	if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO)
+		request_region(addr, length, desc);
+	else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
+		request_mem_region(addr, length, desc);
 }
 
-static void __init acpi_reserve_resources(void)
+static int __init acpi_reserve_resources(void)
 {
 	acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length,
 		"ACPI PM1a_EVT_BLK");
@@ -207,7 +211,10 @@ static void __init acpi_reserve_resources(void)
 	if (!(acpi_gbl_FADT.gpe1_block_length & 0x1))
 		acpi_request_region(&acpi_gbl_FADT.xgpe1_block,
 			       acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK");
+
+	return 0;
 }
+fs_initcall_sync(acpi_reserve_resources);
 
 void acpi_os_printf(const char *fmt, ...)
 {
@@ -1838,7 +1845,6 @@ acpi_status __init acpi_os_initialize(void)
 
 acpi_status __init acpi_os_initialize1(void)
 {
-	acpi_reserve_resources();
 	kacpid_wq = alloc_workqueue("kacpid", 0, 1);
 	kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 1);
 	kacpi_hotplug_wq = alloc_ordered_workqueue("kacpi_hotplug", 0);
drivers/acpi/resource.c +15 -169

219 lines not on this page · raw message

drivers/ata/libata-core.c +19 -4
index 577849c6611a..41c99be9bd41 100644
@@ -2478,6 +2478,10 @@ int ata_dev_configure(struct ata_device *dev)
 		dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_128,
 					 dev->max_sectors);
 
+	if (dev->horkage & ATA_HORKAGE_MAX_SEC_1024)
+		dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_1024,
+					 dev->max_sectors);
+
 	if (dev->horkage & ATA_HORKAGE_MAX_SEC_LBA48)
 		dev->max_sectors = ATA_MAX_SECTORS_LBA48;
 
@@ -4146,6 +4150,12 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
 	{ "Slimtype DVD A  DS8A8SH", NULL,	ATA_HORKAGE_MAX_SEC_LBA48 },
 	{ "Slimtype DVD A  DS8A9SH", NULL,	ATA_HORKAGE_MAX_SEC_LBA48 },
 
+	/*
+	 * Causes silent data corruption with higher max sects.
+	 * http://lkml.kernel.org/g/[email protected]
+	 */
+	{ "ST380013AS",		"3.20",		ATA_HORKAGE_MAX_SEC_1024 },
+
 	/* Devices we expect to fail diagnostics */
 
 	/* Devices where NCQ should be avoided */
@@ -4174,9 +4184,10 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
 	{ "ST3320[68]13AS",	"SD1[5-9]",	ATA_HORKAGE_NONCQ |
 						ATA_HORKAGE_FIRMWARE_WARN },
 
-	/* Seagate Momentus SpinPoint M8 seem to have FPMDA_AA issues */
+	/* drives which fail FPDMA_AA activation (some may freeze afterwards) */
 	{ "ST1000LM024 HN-M101MBB", "2AR10001",	ATA_HORKAGE_BROKEN_FPDMA_AA },
 	{ "ST1000LM024 HN-M101MBB", "2BA30001",	ATA_HORKAGE_BROKEN_FPDMA_AA },
+	{ "VB0250EAVER",	"HPG7",		ATA_HORKAGE_BROKEN_FPDMA_AA },
 
 	/* Blacklist entries taken from Silicon Image 3124/3132
 	   Windows driver .inf file - also several Linux problem reports */
@@ -4225,11 +4236,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
 	{ "PIONEER DVD-RW  DVR-216D",	NULL,	ATA_HORKAGE_NOSETXFER },
 
 	/* devices that don't properly handle queued TRIM commands */
-	{ "Micron_M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |
+	{ "Micron_M500_*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |
 						ATA_HORKAGE_ZERO_AFTER_TRIM, },
 	{ "Crucial_CT*M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |
 						ATA_HORKAGE_ZERO_AFTER_TRIM, },
-	{ "Micron_M5[15]0*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |
+	{ "Micron_M5[15]0_*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |
 						ATA_HORKAGE_ZERO_AFTER_TRIM, },
 	{ "Crucial_CT*M550*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |
 						ATA_HORKAGE_ZERO_AFTER_TRIM, },
@@ -4238,6 +4249,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
 	{ "Samsung SSD 8*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |
 						ATA_HORKAGE_ZERO_AFTER_TRIM, },
 
+	/* devices that don't properly handle TRIM commands */
+	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM, },
+
 	/*
 	 * As defined, the DRAT (Deterministic Read After Trim) and RZAT
 	 * (Return Zero After Trim) flags in the ATA Command Set are
@@ -4501,7 +4515,8 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev)
 	else /* In the ancient relic department - skip all of this */
 		return 0;
 
-	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);
+	/* On some disks, this command causes spin-up, so we need longer timeout */
+	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000);
 
 	DPRINTK("EXIT, err_mask=%x\n", err_mask);
 	return err_mask;
drivers/ata/libata-eh.c +12 -1
index cf0022ec07f2..7465031a893c 100644
@@ -1507,16 +1507,21 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
 {
 	struct ata_taskfile tf;
 	unsigned int err_mask;
+	bool dma = false;
 
 	DPRINTK("read log page - log 0x%x, page 0x%x\n", log, page);
 
+retry:
 	ata_tf_init(dev, &tf);
-	if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id)) {
+	if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&
+	    !(dev->horkage & ATA_HORKAGE_NO_NCQ_LOG)) {
 		tf.command = ATA_CMD_READ_LOG_DMA_EXT;
 		tf.protocol = ATA_PROT_DMA;
+		dma = true;
 	} else {
 		tf.command = ATA_CMD_READ_LOG_EXT;
 		tf.protocol = ATA_PROT_PIO;
+		dma = false;
 	}
 	tf.lbal = log;
 	tf.lbam = page;
@@ -1527,6 +1532,12 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
 	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_FROM_DEVICE,
 				     buf, sectors * ATA_SECT_SIZE, 0);
 
+	if (err_mask && dma) {
+		dev->horkage |= ATA_HORKAGE_NO_NCQ_LOG;
+		ata_dev_warn(dev, "READ LOG DMA EXT failed, trying unqueued\n");
+		goto retry;
+	}
+
 	DPRINTK("EXIT, err_mask=%x\n", err_mask);
 	return err_mask;
 }
drivers/ata/libata-scsi.c +2 -1
index 3131adcc1f87..641a61a59e89 100644
@@ -2568,7 +2568,8 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf)
 		rbuf[14] = (lowest_aligned >> 8) & 0x3f;
 		rbuf[15] = lowest_aligned;
 
-		if (ata_id_has_trim(args->id)) {
+		if (ata_id_has_trim(args->id) &&
+		    !(dev->horkage & ATA_HORKAGE_NOTRIM)) {
 			rbuf[14] |= 0x80; /* LBPME */
 
 			if (ata_id_has_zero_after_trim(args->id) &&
drivers/ata/libata-transport.c +24 -0
index 3227b7c8a05f..e2d94972962d 100644
@@ -560,6 +560,29 @@ show_ata_dev_gscr(struct device *dev,
 
 static DEVICE_ATTR(gscr, S_IRUGO, show_ata_dev_gscr, NULL);
 
+static ssize_t
+show_ata_dev_trim(struct device *dev,
+		  struct device_attribute *attr, char *buf)
+{
+	struct ata_device *ata_dev = transport_class_to_dev(dev);
+	unsigned char *mode;
+
+	if (!ata_id_has_trim(ata_dev->id))
+		mode = "unsupported";
+	else if (ata_dev->horkage & ATA_HORKAGE_NOTRIM)
+		mode = "forced_unsupported";
+	else if (ata_dev->horkage & ATA_HORKAGE_NO_NCQ_TRIM)
+			mode = "forced_unqueued";
+	else if (ata_fpdma_dsm_supported(ata_dev))
+		mode = "queued";
+	else
+		mode = "unqueued";
+
+	return snprintf(buf, 20, "%s\n", mode);
+}
+
+static DEVICE_ATTR(trim, S_IRUGO, show_ata_dev_trim, NULL);
+
 static DECLARE_TRANSPORT_CLASS(ata_dev_class,
 			       "ata_device", NULL, NULL, NULL);
 
@@ -733,6 +756,7 @@ struct scsi_transport_template *ata_attach_transport(void)
 	SETUP_DEV_ATTRIBUTE(ering);
 	SETUP_DEV_ATTRIBUTE(id);
 	SETUP_DEV_ATTRIBUTE(gscr);
+	SETUP_DEV_ATTRIBUTE(trim);
 	BUG_ON(count > ATA_DEV_ATTRS);
 	i->dev_attrs[count] = NULL;
 
drivers/base/firmware_class.c +13 -3
index 171841ad1008..4d1d9de4f9bf 100644
@@ -544,10 +544,8 @@ static void fw_dev_release(struct device *dev)
 	kfree(fw_priv);
 }
 
-static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)
+static int do_firmware_uevent(struct firmware_priv *fw_priv, struct kobj_uevent_env *env)
 {
-	struct firmware_priv *fw_priv = to_firmware_priv(dev);
-
 	if (add_uevent_var(env, "FIRMWARE=%s", fw_priv->buf->fw_id))
 		return -ENOMEM;
 	if (add_uevent_var(env, "TIMEOUT=%i", loading_timeout))
@@ -558,6 +556,18 @@ static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)
 	return 0;
 }
 
+static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+	struct firmware_priv *fw_priv = to_firmware_priv(dev);
+	int err = 0;
+
+	mutex_lock(&fw_lock);
+	if (fw_priv->buf)
+		err = do_firmware_uevent(fw_priv, env);
+	mutex_unlock(&fw_lock);
+	return err;
+}
+
 static struct class firmware_class = {
 	.name		= "firmware",
 	.class_attrs	= firmware_class_attrs,
drivers/base/power/clock_ops.c +1 -1
index 7fdd0172605a..c7b0fcebf168 100644
@@ -93,7 +93,7 @@ static int __pm_clk_add(struct device *dev, const char *con_id,
 			return -ENOMEM;
 		}
 	} else {
-		if (IS_ERR(ce->clk) || !__clk_get(clk)) {
+		if (IS_ERR(clk) || !__clk_get(clk)) {
 			kfree(ce);
 			return -ENOENT;
 		}
drivers/block/loop.c +14 -16
index d7173cb1ea76..cef6fa83a274 100644
@@ -86,8 +86,6 @@ static DEFINE_MUTEX(loop_index_mutex);
 static int max_part;
 static int part_shift;
 
-static struct workqueue_struct *loop_wq;
-
 static int transfer_xor(struct loop_device *lo, int cmd,
 			struct page *raw_page, unsigned raw_off,
 			struct page *loop_page, unsigned loop_off,
@@ -725,6 +723,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
 	size = get_loop_size(lo, file);
 	if ((loff_t)(sector_t)size != size)
 		goto out_putf;
+	error = -ENOMEM;
+	lo->wq = alloc_workqueue("kloopd%d",
+			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 16,
+			lo->lo_number);
+	if (!lo->wq)
+		goto out_putf;
 
 	error = 0;
 
@@ -872,6 +876,8 @@ static int loop_clr_fd(struct loop_device *lo)
 	lo->lo_flags = 0;
 	if (!part_shift)
 		lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN;
+	destroy_workqueue(lo->wq);
+	lo->wq = NULL;
 	mutex_unlock(&lo->lo_ctl_mutex);
 	/*
 	 * Need not hold lo_ctl_mutex to fput backing file.
@@ -1425,9 +1431,13 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
 		const struct blk_mq_queue_data *bd)
 {
 	struct loop_cmd *cmd = blk_mq_rq_to_pdu(bd->rq);
+	struct loop_device *lo = cmd->rq->q->queuedata;
 
 	blk_mq_start_request(bd->rq);
 
+	if (lo->lo_state != Lo_bound)
+		return -EIO;
+
 	if (cmd->rq->cmd_flags & REQ_WRITE) {
 		struct loop_device *lo = cmd->rq->q->queuedata;
 		bool need_sched = true;
@@ -1441,9 +1451,9 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
 		spin_unlock_irq(&lo->lo_lock);
 
 		if (need_sched)
-			queue_work(loop_wq, &lo->write_work);
+			queue_work(lo->wq, &lo->write_work);
 	} else {
-		queue_work(loop_wq, &cmd->read_work);
+		queue_work(lo->wq, &cmd->read_work);
 	}
 
 	return BLK_MQ_RQ_QUEUE_OK;
@@ -1455,9 +1465,6 @@ static void loop_handle_cmd(struct loop_cmd *cmd)
 	struct loop_device *lo = cmd->rq->q->queuedata;
 	int ret = -EIO;
 
-	if (lo->lo_state != Lo_bound)
-		goto failed;
-
 	if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY))
 		goto failed;
 
@@ -1806,13 +1813,6 @@ static int __init loop_init(void)
 		goto misc_out;
 	}
 
-	loop_wq = alloc_workqueue("kloopd",
-			WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0);
-	if (!loop_wq) {
-		err = -ENOMEM;
-		goto misc_out;
-	}
-
 	blk_register_region(MKDEV(LOOP_MAJOR, 0), range,
 				  THIS_MODULE, loop_probe, NULL, NULL);
 
@@ -1850,8 +1850,6 @@ static void __exit loop_exit(void)
 	blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range);
 	unregister_blkdev(LOOP_MAJOR, "loop");
 
-	destroy_workqueue(loop_wq);
-
 	misc_deregister(&loop_misc);
 }
 
drivers/block/loop.h +1 -0
index 301c27f8323f..49564edf5581 100644
@@ -54,6 +54,7 @@ struct loop_device {
 	gfp_t		old_gfp_mask;
 
 	spinlock_t		lo_lock;
+	struct workqueue_struct *wq;
 	struct list_head	write_cmd_head;
 	struct work_struct	write_work;
 	bool			write_started;
drivers/block/rbd.c +2 -2
index ec6c5c6e1ac9..53f253574abe 100644
@@ -2001,11 +2001,11 @@ static struct rbd_obj_request *rbd_obj_request_create(const char *object_name,
 	rbd_assert(obj_request_type_valid(type));
 
 	size = strlen(object_name) + 1;
-	name = kmalloc(size, GFP_KERNEL);
+	name = kmalloc(size, GFP_NOIO);
 	if (!name)
 		return NULL;
 
-	obj_request = kmem_cache_zalloc(rbd_obj_request_cache, GFP_KERNEL);
+	obj_request = kmem_cache_zalloc(rbd_obj_request_cache, GFP_NOIO);
 	if (!obj_request) {
 		kfree(name);
 		return NULL;
drivers/bluetooth/btbcm.c +5 -6
index 4bba86677adc..3f146c9911c1 100644
@@ -378,12 +378,11 @@ int btbcm_setup_apple(struct hci_dev *hdev)
 
 	/* Read Verbose Config Version Info */
 	skb = btbcm_read_verbose_config(hdev);
-	if (IS_ERR(skb))
-		return PTR_ERR(skb);
-
-	BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1],
-		get_unaligned_le16(skb->data + 5));
-	kfree_skb(skb);
+	if (!IS_ERR(skb)) {
+		BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1],
+			get_unaligned_le16(skb->data + 5));
+		kfree_skb(skb);
+	}
 
 	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
 
drivers/bluetooth/btusb.c +25 -13
index 420cc9f3eb76..c65501539224 100644
@@ -268,7 +268,7 @@ static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x0e5e, 0x6622), .driver_info = BTUSB_BROKEN_ISOC },
 
 	/* Roper Class 1 Bluetooth Dongle (Silicon Wave based) */
-	{ USB_DEVICE(0x1300, 0x0001), .driver_info = BTUSB_SWAVE },
+	{ USB_DEVICE(0x1310, 0x0001), .driver_info = BTUSB_SWAVE },
 
 	/* Digianswer devices */
 	{ USB_DEVICE(0x08fd, 0x0001), .driver_info = BTUSB_DIGIANSWER },
@@ -1993,6 +1993,8 @@ static int btusb_setup_intel(struct hci_dev *hdev)
 	}
 	fw_ptr = fw->data;
 
+	kfree_skb(skb);
+
 	/* This Intel specific command enables the manufacturer mode of the
 	 * controller.
 	 *
@@ -2334,6 +2336,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
 	struct intel_boot_params *params;
 	const struct firmware *fw;
 	const u8 *fw_ptr;
+	u32 frag_len;
 	char fwname[64];
 	ktime_t calltime, delta, rettime;
 	unsigned long long duration;
@@ -2540,24 +2543,33 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
 	}
 
 	fw_ptr = fw->data + 644;
+	frag_len = 0;
 
 	while (fw_ptr - fw->data < fw->size) {
-		struct hci_command_hdr *cmd = (void *)fw_ptr;
-		u8 cmd_len;
+		struct hci_command_hdr *cmd = (void *)(fw_ptr + frag_len);
 
-		cmd_len = sizeof(*cmd) + cmd->plen;
+		frag_len += sizeof(*cmd) + cmd->plen;
 
-		/* Send each command from the firmware data buffer as
-		 * a single Data fragment.
+		/* The paramter length of the secure send command requires
+		 * a 4 byte alignment. It happens so that the firmware file
+		 * contains proper Intel_NOP commands to align the fragments
+		 * as needed.
+		 *
+		 * Send set of commands with 4 byte alignment from the
+		 * firmware data buffer as a single Data fragement.
 		 */
-		err = btusb_intel_secure_send(hdev, 0x01, cmd_len, fw_ptr);
-		if (err < 0) {
-			BT_ERR("%s: Failed to send firmware data (%d)",
-			       hdev->name, err);
-			goto done;
-		}
+		if (!(frag_len % 4)) {
+			err = btusb_intel_secure_send(hdev, 0x01, frag_len,
+						      fw_ptr);
+			if (err < 0) {
+				BT_ERR("%s: Failed to send firmware data (%d)",
+				       hdev->name, err);
+				goto done;
+			}
 
-		fw_ptr += cmd_len;
+			fw_ptr += frag_len;
+			frag_len = 0;
+		}
 	}
 
 	set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
drivers/bus/arm-ccn.c +1 -1
index aaa0f2a87118..60397ec77ff7 100644
@@ -212,7 +212,7 @@ static int arm_ccn_node_to_xp_port(int node)
 
 static void arm_ccn_pmu_config_set(u64 *config, u32 node_xp, u32 type, u32 port)
 {
-	*config &= ~((0xff << 0) | (0xff << 8) | (0xff << 24));
+	*config &= ~((0xff << 0) | (0xff << 8) | (0x3 << 24));
 	*config |= (node_xp << 0) | (type << 8) | (port << 24);
 }
 
drivers/char/agp/intel-gtt.c +1 -1
index 0b4188b9af7c..c6dea3f6917b 100644
@@ -581,7 +581,7 @@ static inline int needs_ilk_vtd_wa(void)
 	/* Query intel_iommu to see if we need the workaround. Presumably that
 	 * was loaded first.
 	 */
-	if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB ||
+	if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG ||
 	     gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) &&
 	     intel_iommu_gfx_mapped)
 		return 1;
drivers/char/tpm/tpm-chip.c +2 -1
index 283f00a7f036..1082d4bb016a 100644
@@ -129,8 +129,9 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,
 
 	device_initialize(&chip->dev);
 
-	chip->cdev.owner = chip->pdev->driver->owner;
 	cdev_init(&chip->cdev, &tpm_fops);
+	chip->cdev.owner = chip->pdev->driver->owner;
+	chip->cdev.kobj.parent = &chip->dev.kobj;
 
 	return chip;
 }
drivers/char/tpm/tpm_crb.c +10 -2
index b26ceee3585e..1267322595da 100644
@@ -233,6 +233,14 @@ static int crb_acpi_add(struct acpi_device *device)
 		return -ENODEV;
 	}
 
+	/* At least some versions of AMI BIOS have a bug that TPM2 table has
+	 * zero address for the control area and therefore we must fail.
+	*/
+	if (!buf->control_area_pa) {
+		dev_err(dev, "TPM2 ACPI table has a zero address for the control area\n");
+		return -EINVAL;
+	}
+
 	if (buf->hdr.length < sizeof(struct acpi_tpm2)) {
 		dev_err(dev, "TPM2 ACPI table has wrong size");
 		return -EINVAL;
@@ -267,7 +275,7 @@ static int crb_acpi_add(struct acpi_device *device)
 
 	memcpy_fromio(&pa, &priv->cca->cmd_pa, 8);
 	pa = le64_to_cpu(pa);
-	priv->cmd = devm_ioremap_nocache(dev, le64_to_cpu(pa),
+	priv->cmd = devm_ioremap_nocache(dev, pa,
 					 ioread32(&priv->cca->cmd_size));
 	if (!priv->cmd) {
 		dev_err(dev, "ioremap of the command buffer failed\n");
@@ -276,7 +284,7 @@ static int crb_acpi_add(struct acpi_device *device)
 
 	memcpy_fromio(&pa, &priv->cca->rsp_pa, 8);
 	pa = le64_to_cpu(pa);
-	priv->rsp = devm_ioremap_nocache(dev, le64_to_cpu(pa),
+	priv->rsp = devm_ioremap_nocache(dev, pa,
 					 ioread32(&priv->cca->rsp_size));
 	if (!priv->rsp) {
 		dev_err(dev, "ioremap of the response buffer failed\n");
drivers/char/tpm/tpm_ibmvtpm.c +3 -2
index 42ffa5e7a1e0..27ebf9511cb4 100644
@@ -578,6 +578,9 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
 		goto cleanup;
 	}
 
+	ibmvtpm->dev = dev;
+	ibmvtpm->vdev = vio_dev;
+
 	crq_q = &ibmvtpm->crq_queue;
 	crq_q->crq_addr = (struct ibmvtpm_crq *)get_zeroed_page(GFP_KERNEL);
 	if (!crq_q->crq_addr) {
@@ -622,8 +625,6 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
 
 	crq_q->index = 0;
 
-	ibmvtpm->dev = dev;
-	ibmvtpm->vdev = vio_dev;
 	TPM_VPRIV(chip) = (void *)ibmvtpm;
 
 	spin_lock_init(&ibmvtpm->rtce_lock);
drivers/clk/clk.c +3 -2
index 5b0f41868b42..9f9cadd00bc8 100644
@@ -230,11 +230,12 @@ static void clk_dump_one(struct seq_file *s, struct clk_core *c, int level)
 	if (!c)
 		return;
 
+	/* This should be JSON format, i.e. elements separated with a comma */
 	seq_printf(s, "\"%s\": { ", c->name);
 	seq_printf(s, "\"enable_count\": %d,", c->enable_count);
 	seq_printf(s, "\"prepare_count\": %d,", c->prepare_count);
-	seq_printf(s, "\"rate\": %lu", clk_core_get_rate(c));
-	seq_printf(s, "\"accuracy\": %lu", clk_core_get_accuracy(c));
+	seq_printf(s, "\"rate\": %lu,", clk_core_get_rate(c));
+	seq_printf(s, "\"accuracy\": %lu,", clk_core_get_accuracy(c));
 	seq_printf(s, "\"phase\": %d", clk_core_get_phase(c));
 }
 
drivers/clk/qcom/clk-rcg2.c +3 -6
index b95d17fbb8d7..92936f0912d2 100644
@@ -530,19 +530,16 @@ static int clk_pixel_set_rate(struct clk_hw *hw, unsigned long rate,
 	struct clk_rcg2 *rcg = to_clk_rcg2(hw);
 	struct freq_tbl f = *rcg->freq_tbl;
 	const struct frac_entry *frac = frac_table_pixel;
-	unsigned long request, src_rate;
+	unsigned long request;
 	int delta = 100000;
 	u32 mask = BIT(rcg->hid_width) - 1;
 	u32 hid_div;
-	int index = qcom_find_src_index(hw, rcg->parent_map, f.src);
-	struct clk *parent = clk_get_parent_by_index(hw->clk, index);
 
 	for (; frac->num; frac++) {
 		request = (rate * frac->den) / frac->num;
 
-		src_rate = __clk_round_rate(parent, request);
-		if ((src_rate < (request - delta)) ||
-			(src_rate > (request + delta)))
+		if ((parent_rate < (request - delta)) ||
+			(parent_rate > (request + delta)))
 			continue;
 
 		regmap_read(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG,
drivers/clk/ti/clk-dra7-atl.c +5 -0
index d86bc46b93bd..0a1df821860f 100644
@@ -252,6 +252,11 @@ static int of_dra7_atl_clk_probe(struct platform_device *pdev)
 		}
 
 		clk = of_clk_get_from_provider(&clkspec);
+		if (IS_ERR(clk)) {
+			pr_err("%s: failed to get atl clock %d from provider\n",
+			       __func__, i);
+			return PTR_ERR(clk);
+		}
 
 		cdesc = to_atl_desc(__clk_get_hw(clk));
 		cdesc->cinfo = cinfo;
drivers/clocksource/exynos_mct.c +30 -13

69 lines not on this page · raw message

drivers/dma/mv_xor.c +46 -26

91 lines not on this page · raw message

drivers/dma/mv_xor.h +1 -0
index 91958dba39a2..0e302b3a33ad 100644
@@ -31,6 +31,7 @@
 #define XOR_OPERATION_MODE_XOR		0
 #define XOR_OPERATION_MODE_MEMCPY	2
 #define XOR_DESCRIPTOR_SWAP		BIT(14)
+#define XOR_DESC_SUCCESS		0x40000000
 
 #define XOR_DESC_DMA_OWNED		BIT(31)
 #define XOR_DESC_EOD_INT_EN		BIT(31)
drivers/edac/octeon_edac-l2c.c +1 -1
index 7e98084d3645..afea7fc625cc 100644
@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev)
 	l2c->ctl_name = "octeon_l2c_err";
 
 
-	if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
+	if (OCTEON_IS_OCTEON1PLUS()) {
 		union cvmx_l2t_err l2t_err;
 		union cvmx_l2d_err l2d_err;
 
drivers/edac/octeon_edac-lmc.c +1 -1
index bb19e0732681..cda6dab5067a 100644
@@ -234,7 +234,7 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev)
 	layers[0].size = 1;
 	layers[0].is_virt_csrow = false;
 
-	if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
+	if (OCTEON_IS_OCTEON1PLUS()) {
 		union cvmx_lmcx_mem_cfg0 cfg0;
 
 		cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0));
drivers/edac/octeon_edac-pc.c +1 -1
index 0f83c33a7d1f..2ab6cf24c959 100644
@@ -73,7 +73,7 @@ static int  co_cache_error_event(struct notifier_block *this,
 			edac_device_handle_ce(p->ed, cpu, 0, "dcache");
 
 		/* Clear the error indication */
-		if (OCTEON_IS_MODEL(OCTEON_FAM_2))
+		if (OCTEON_IS_OCTEON2())
 			write_octeon_c0_dcacheerr(1);
 		else
 			write_octeon_c0_dcacheerr(0);
drivers/firmware/dmi_scan.c +9 -4
index 97b1616aa391..bba843c2b0ac 100644
@@ -89,9 +89,9 @@ static void dmi_table(u8 *buf,
 
 	/*
 	 * Stop when we have seen all the items the table claimed to have
-	 * (SMBIOS < 3.0 only) OR we reach an end-of-table marker OR we run
-	 * off the end of the table (should never happen but sometimes does
-	 * on bogus implementations.)
+	 * (SMBIOS < 3.0 only) OR we reach an end-of-table marker (SMBIOS
+	 * >= 3.0 only) OR we run off the end of the table (should never
+	 * happen but sometimes does on bogus implementations.)
 	 */
 	while ((!dmi_num || i < dmi_num) &&
 	       (data - buf + sizeof(struct dmi_header)) <= dmi_len) {
@@ -110,8 +110,13 @@ static void dmi_table(u8 *buf,
 
 		/*
 		 * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
+		 * For tables behind a 64-bit entry point, we have no item
+		 * count and no exact table length, so stop on end-of-table
+		 * marker. For tables behind a 32-bit entry point, we have
+		 * seen OEM structures behind the end-of-table marker on
+		 * some systems, so don't trust it.
 		 */
-		if (dm->type == DMI_ENTRY_END_OF_TABLE)
+		if (!dmi_num && dm->type == DMI_ENTRY_END_OF_TABLE)
 			break;
 
 		data += 2;
drivers/gpu/drm/bridge/ptn3460.c +1 -0
index 9d2f053382e1..63a09e4079f3 100644
@@ -15,6 +15,7 @@
 
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of.h>
drivers/gpu/drm/drm_crtc.c +6 -6
index 3007b44e6bf4..800a025dd062 100644
@@ -2749,8 +2749,11 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 		return -EINVAL;
 
-	/* For some reason crtc x/y offsets are signed internally. */
-	if (crtc_req->x > INT_MAX || crtc_req->y > INT_MAX)
+	/*
+	 * Universal plane src offsets are only 16.16, prevent havoc for
+	 * drivers using universal plane code internally.
+	 */
+	if (crtc_req->x & 0xffff0000 || crtc_req->y & 0xffff0000)
 		return -ERANGE;
 
 	drm_modeset_lock_all(dev);
@@ -5048,12 +5051,9 @@ void drm_mode_config_reset(struct drm_device *dev)
 		if (encoder->funcs->reset)
 			encoder->funcs->reset(encoder);
 
-	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-		connector->status = connector_status_unknown;
-
+	list_for_each_entry(connector, &dev->mode_config.connector_list, head)
 		if (connector->funcs->reset)
 			connector->funcs->reset(connector);
-	}
 }
 EXPORT_SYMBOL(drm_mode_config_reset);
 
drivers/gpu/drm/drm_dp_mst_topology.c +60 -7

126 lines not on this page · raw message

drivers/gpu/drm/drm_ioc32.c +60 -0

78 lines not on this page · raw message

drivers/gpu/drm/i915/i915_gem.c +1 -0
index 2d0995e7afc3..596bce56e379 100644
@@ -2401,6 +2401,7 @@ int __i915_add_request(struct intel_engine_cs *ring,
 	}
 
 	request->emitted_jiffies = jiffies;
+	ring->last_submitted_seqno = request->seqno;
 	list_add_tail(&request->list, &ring->request_list);
 	request->file_priv = NULL;
 
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
index 0239fbff7bf7..ad90fa3045e5 100644
@@ -502,17 +502,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
 		struct page *page_table;
 
 		if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
-			continue;
+			break;
 
 		pd = ppgtt->pdp.page_directory[pdpe];
 
 		if (WARN_ON(!pd->page_table[pde]))
-			continue;
+			break;
 
 		pt = pd->page_table[pde];
 
 		if (WARN_ON(!pt->page))
-			continue;
+			break;
 
 		page_table = pt->page;
 
drivers/gpu/drm/i915/i915_ioc32.c +1 -1
index 176de6322e4d..23aa04cded6b 100644
@@ -204,7 +204,7 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	drm_ioctl_compat_t *fn = NULL;
 	int ret;
 
-	if (nr < DRM_COMMAND_BASE)
+	if (nr < DRM_COMMAND_BASE || nr >= DRM_COMMAND_END)
 		return drm_compat_ioctl(filp, cmd, arg);
 
 	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
drivers/gpu/drm/i915/i915_irq.c +3 -10
index 6d494432b19f..b0df8d10482a 100644
@@ -2650,18 +2650,11 @@ static void gen8_disable_vblank(struct drm_device *dev, int pipe)
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 
-static struct drm_i915_gem_request *
-ring_last_request(struct intel_engine_cs *ring)
-{
-	return list_entry(ring->request_list.prev,
-			  struct drm_i915_gem_request, list);
-}
-
 static bool
-ring_idle(struct intel_engine_cs *ring)
+ring_idle(struct intel_engine_cs *ring, u32 seqno)
 {
 	return (list_empty(&ring->request_list) ||
-		i915_gem_request_completed(ring_last_request(ring), false));
+		i915_seqno_passed(seqno, ring->last_submitted_seqno));
 }
 
 static bool
@@ -2883,7 +2876,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)
 		acthd = intel_ring_get_active_head(ring);
 
 		if (ring->hangcheck.seqno == seqno) {
-			if (ring_idle(ring)) {
+			if (ring_idle(ring, seqno)) {
 				ring->hangcheck.action = HANGCHECK_IDLE;
 
 				if (waitqueue_active(&ring->irq_queue)) {
drivers/gpu/drm/i915/i915_reg.h +1 -0
index 773d1d24e604..a30db4b4050e 100644
@@ -3209,6 +3209,7 @@ enum skl_disp_power_wells {
 #define   BLM_POLARITY_PNV			(1 << 0) /* pnv only */
 
 #define BLC_HIST_CTL	(dev_priv->info.display_mmio_offset + 0x61260)
+#define  BLM_HISTOGRAM_ENABLE			(1 << 31)
 
 /* New registers for PCH-split platforms. Safe where new bits show up, the
  * register layout machtes with gen4 BLC_PWM_CTL[12]. */
drivers/gpu/drm/i915/intel_display.c +13 -0
index d0f3cbc87474..57c887843dc3 100644
@@ -12499,6 +12499,16 @@ intel_check_primary_plane(struct drm_plane *plane,
 				intel_crtc->atomic.wait_vblank = true;
 		}
 
+		/*
+		 * FIXME: Actually if we will still have any other plane enabled
+		 * on the pipe we could let IPS enabled still, but for
+		 * now lets consider that when we make primary invisible
+		 * by setting DSPCNTR to 0 on update_primary_plane function
+		 * IPS needs to be disable.
+		 */
+		if (!state->visible || !fb)
+			intel_crtc->atomic.disable_ips = true;
+
 		intel_crtc->atomic.fb_bits |=
 			INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);
 
@@ -12590,6 +12600,9 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc)
 	if (intel_crtc->atomic.disable_fbc)
 		intel_fbc_disable(dev);
 
+	if (intel_crtc->atomic.disable_ips)
+		hsw_disable_ips(intel_crtc);
+
 	if (intel_crtc->atomic.pre_disable_primary)
 		intel_pre_disable_primary(crtc);
 
drivers/gpu/drm/i915/intel_drv.h +1 -0
index 897f17db08af..68d1f74a7403 100644
@@ -424,6 +424,7 @@ struct intel_crtc_atomic_commit {
 	/* Sleepable operations to perform before commit */
 	bool wait_for_flips;
 	bool disable_fbc;
+	bool disable_ips;
 	bool pre_disable_primary;
 	bool update_wm;
 	unsigned disabled_planes;
drivers/gpu/drm/i915/intel_panel.c +8 -0
index 08532d4ffe0a..2bf92cba4a55 100644
@@ -879,6 +879,14 @@ static void i9xx_enable_backlight(struct intel_connector *connector)
 
 	/* XXX: combine this into above write? */
 	intel_panel_actually_set_backlight(connector, panel->backlight.level);
+
+	/*
+	 * Needed to enable backlight on some 855gm models. BLC_HIST_CTL is
+	 * 855gm only, but checking for gen2 is safe, as 855gm is the only gen2
+	 * that has backlight.
+	 */
+	if (IS_GEN2(dev))
+		I915_WRITE(BLC_HIST_CTL, BLM_HISTOGRAM_ENABLE);
 }
 
 static void i965_enable_backlight(struct intel_connector *connector)
drivers/gpu/drm/i915/intel_ringbuffer.h +7 -0
index c761fe05ad6f..94514d364d25 100644
@@ -266,6 +266,13 @@ struct  intel_engine_cs {
 	 * Do we have some not yet emitted requests outstanding?
 	 */
 	struct drm_i915_gem_request *outstanding_lazy_request;
+	/**
+	 * Seqno of request most recently submitted to request_list.
+	 * Used exclusively by hang checker to avoid grabbing lock while
+	 * inspecting request list.
+	 */
+	u32 last_submitted_seqno;
+
 	bool gpu_caches_dirty;
 
 	wait_queue_head_t irq_queue;
drivers/gpu/drm/i915/intel_uncore.c +19 -7
index ff2a74651dd4..a18807ec8371 100644
@@ -1220,10 +1220,12 @@ int i915_reg_read_ioctl(struct drm_device *dev,
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_reg_read *reg = data;
 	struct register_whitelist const *entry = whitelist;
+	unsigned size;
+	u64 offset;
 	int i, ret = 0;
 
 	for (i = 0; i < ARRAY_SIZE(whitelist); i++, entry++) {
-		if (entry->offset == reg->offset &&
+		if (entry->offset == (reg->offset & -entry->size) &&
 		    (1 << INTEL_INFO(dev)->gen & entry->gen_bitmask))
 			break;
 	}
@@ -1231,23 +1233,33 @@ int i915_reg_read_ioctl(struct drm_device *dev,
 	if (i == ARRAY_SIZE(whitelist))
 		return -EINVAL;
 
+	/* We use the low bits to encode extra flags as the register should
+	 * be naturally aligned (and those that are not so aligned merely
+	 * limit the available flags for that register).
+	 */
+	offset = entry->offset;
+	size = entry->size;
+	size |= reg->offset ^ offset;
+
 	intel_runtime_pm_get(dev_priv);
 
-	switch (entry->size) {
+	switch (size) {
+	case 8 | 1:
+		reg->val = I915_READ64_2x32(offset, offset+4);
+		break;
 	case 8:
-		reg->val = I915_READ64(reg->offset);
+		reg->val = I915_READ64(offset);
 		break;
 	case 4:
-		reg->val = I915_READ(reg->offset);
+		reg->val = I915_READ(offset);
 		break;
 	case 2:
-		reg->val = I915_READ16(reg->offset);
+		reg->val = I915_READ16(offset);
 		break;
 	case 1:
-		reg->val = I915_READ8(reg->offset);
+		reg->val = I915_READ8(offset);
 		break;
 	default:
-		MISSING_CASE(entry->size);
 		ret = -EINVAL;
 		goto out;
 	}
drivers/gpu/drm/qxl/qxl_cmd.c +1 -0
index 97823644d347..f33251d67914 100644
@@ -505,6 +505,7 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev,
 
 	cmd = (struct qxl_surface_cmd *)qxl_release_map(qdev, release);
 	cmd->type = QXL_SURFACE_CMD_CREATE;
+	cmd->flags = QXL_SURF_FLAG_KEEP_DATA;
 	cmd->u.surface_create.format = surf->surf.format;
 	cmd->u.surface_create.width = surf->surf.width;
 	cmd->u.surface_create.height = surf->surf.height;
drivers/gpu/drm/qxl/qxl_ioctl.c +3 -1
index b110883f8253..7354a4cda59d 100644
@@ -122,8 +122,10 @@ static struct qxl_bo *qxlhw_handle_to_bo(struct qxl_device *qdev,
 	qobj = gem_to_qxl_bo(gobj);
 
 	ret = qxl_release_list_add(release, qobj);
-	if (ret)
+	if (ret) {
+		drm_gem_object_unreference_unlocked(gobj);
 		return NULL;
+	}
 
 	return qobj;
 }
drivers/gpu/drm/radeon/ci_dpm.c +1 -1
index 8730562323a8..4a09947be244 100644
@@ -5818,7 +5818,7 @@ int ci_dpm_init(struct radeon_device *rdev)
 			tmp |= DPM_ENABLED;
 			break;
 		default:
-			DRM_ERROR("Invalid PCC GPIO: %u!\n", gpio.shift);
+			DRM_DEBUG("Invalid PCC GPIO: %u!\n", gpio.shift);
 			break;
 		}
 		WREG32_SMC(CNB_PWRMGT_CNTL, tmp);
drivers/gpu/drm/radeon/cik.c +226 -144

430 lines not on this page · raw message

drivers/gpu/drm/radeon/cik_sdma.c +11 -0
index f86eb54e7763..d16f2eebd95e 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/evergreen.c +217 -175

392 lines not on this page · raw message

drivers/gpu/drm/radeon/r600.c +87 -68

155 lines not on this page · raw message

drivers/gpu/drm/radeon/radeon_audio.c +18 -18
index 25191f126f3b..fa719c53449b 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_audio.h +0 -2
index c92d059ab204..8438304f7139 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_cursor.c +37 -47

84 lines not on this page · raw message

drivers/gpu/drm/radeon/radeon_device.c +33 -1
index a7fdfa4f0857..604c44d88e7a 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_fb.c +0 -1
index aeb676708e60..634793ea8418 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_gart.c +8 -4
index 5450fa95a47e..c4777c8d0312 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_gem.c +2 -0
index ac3c1310b953..186d0b792a02 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_irq_kms.c +2 -0
index 7162c935371c..f682e5351252 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_mode.h +0 -1
index fa91a17b81b6..f01c797b78cf 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/radeon_object.c +0 -1
index 318165d4855c..676362769b8d 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/radeon/si.c +192 -144

336 lines not on this page · raw message

drivers/gpu/drm/radeon/si_dpm.c +1 -0
index ff8b83f5e929..9dfcedec05a6 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/rockchip/rockchip_drm_gem.c +34 -33

67 lines not on this page · raw message

drivers/gpu/drm/tegra/dpaux.c +8 -10
index d6b55e3e3716..a43a836e6f88 100644

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/vgem/vgem_drv.c +2 -0
index 7a207ca547be..6394547cf67a 100644

Lines of this file are not shown. View the raw message.

drivers/hwmon/mcp3021.c +1 -13
index d219c06a857b..972444a14cca 100644

Lines of this file are not shown. View the raw message.

drivers/hwmon/nct7802.c +1 -1
index 55765790907b..28fcb2e246d5 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/busses/i2c-at91.c +53 -17

70 lines not on this page · raw message

drivers/i2c/i2c-mux.c +2 -1
index 06cc1ff088f1..2ba7c0fbc615 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/muxes/i2c-mux-pca9541.c +2 -2
index cb772775da43..0c8d4d2cbdaf 100644

Lines of this file are not shown. View the raw message.

drivers/i2c/muxes/i2c-mux-pca954x.c +1 -1
index bea0d2de2993..ea4aa9dfcea9 100644

Lines of this file are not shown. View the raw message.

drivers/iio/accel/bmc150-accel.c +1 -1
index 73e87739d219..bf827d012a71 100644

Lines of this file are not shown. View the raw message.

drivers/iio/adc/Kconfig +1 -2
index e36a73e7c3a8..1bcb65b8d4a1 100644

Lines of this file are not shown. View the raw message.

drivers/iio/adc/at91_adc.c +4 -4
index 8a0eb4a04fb5..7b40925dd4ff 100644

Lines of this file are not shown. View the raw message.

drivers/iio/adc/rockchip_saradc.c +4 -0
index 8d4e019ea4ca..9c311c1e1ac7 100644

Lines of this file are not shown. View the raw message.

drivers/iio/adc/twl4030-madc.c +2 -1
index 94c5f05b4bc1..4caecbea4c97 100644

Lines of this file are not shown. View the raw message.

drivers/iio/common/hid-sensors/hid-sensor-trigger.c +10 -1
index 610fc98f88ef..595511022795 100644

Lines of this file are not shown. View the raw message.

drivers/iio/dac/ad5624r_spi.c +2 -2
index 61bb9d4239ea..e98428df0d44 100644

Lines of this file are not shown. View the raw message.

drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +18 -0
index 17d4bb15be4d..65ce86837177 100644

Lines of this file are not shown. View the raw message.

drivers/iio/light/cm3323.c +1 -1
index 869033e48a1f..a1d4905cc9d2 100644

Lines of this file are not shown. View the raw message.

drivers/iio/light/tcs3414.c +1 -1
index 71c2bde275aa..f8b1df018abe 100644

Lines of this file are not shown. View the raw message.

drivers/iio/proximity/sx9500.c +1 -1
index fa40f6d0ca39..bd26a484abcc 100644

Lines of this file are not shown. View the raw message.

drivers/iio/temperature/tmp006.c +3 -0
index 84a0789c3d96..7a8050996b4e 100644

Lines of this file are not shown. View the raw message.

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +0 -1
index 9dcb66077d6c..219f2122f9b9 100644

Lines of this file are not shown. View the raw message.

drivers/md/bitmap.c +12 -3
index 135a0907e9de..c90118e90708 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-cache-policy-cleaner.c +2 -1
index b04d1f904d07..004e463c9423 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-cache-policy-internal.h +3 -2
index 2256a1f24f73..c198e6defb9c 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-cache-policy-mq.c +28 -13

41 lines not on this page · raw message

drivers/md/dm-cache-policy.h +14 -1
index f50fe360c546..5524e21e4836 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-cache-target.c +38 -20

58 lines not on this page · raw message

drivers/md/dm-stats.c +2 -0
index f478a4c96d2f..419bdd4fc8b8 100644

Lines of this file are not shown. View the raw message.

drivers/md/dm-thin.c +12 -1
index 921aafd12aee..e22e6c892b8a 100644

Lines of this file are not shown. View the raw message.

drivers/md/md.c +7 -2
index 4dbed4a67aaf..b9200282fd77 100644

Lines of this file are not shown. View the raw message.

drivers/md/persistent-data/dm-btree-remove.c +3 -3
index b88757cd0d1d..a03178e91a79 100644

Lines of this file are not shown. View the raw message.

drivers/md/persistent-data/dm-btree.c +1 -1
index 200ac12a1d40..fdd3793e22f9 100644

Lines of this file are not shown. View the raw message.

drivers/md/persistent-data/dm-space-map-metadata.c +35 -15

50 lines not on this page · raw message

drivers/media/dvb-frontends/af9013.c +4 -0
index 8001690d7576..ba6c8f6c42a1 100644

Lines of this file are not shown. View the raw message.

drivers/media/dvb-frontends/cx24116.c +4 -4
index 2916d7c74a1d..7bc68b355c0b 100644

Lines of this file are not shown. View the raw message.

drivers/media/dvb-frontends/cx24117.c +1 -1
index acb965ce0358..af6363573efd 100644

Lines of this file are not shown. View the raw message.

drivers/media/dvb-frontends/s5h1420.c +1 -1
index 93eeaf7118fd..0b4f8fe6bf99 100644

Lines of this file are not shown. View the raw message.

drivers/media/pci/cx18/cx18-streams.c +1 -0
index c82d25d53341..c9860845264f 100644

Lines of this file are not shown. View the raw message.

drivers/media/pci/saa7164/saa7164-encoder.c +6 -5
index 9266965412c3..7a0a65146723 100644

Lines of this file are not shown. View the raw message.

drivers/media/pci/saa7164/saa7164-vbi.c +6 -5
index 6e025fea2542..06117e6c0596 100644

Lines of this file are not shown. View the raw message.

drivers/media/usb/dvb-usb/dib0700_core.c +40 -30

70 lines not on this page · raw message

drivers/media/usb/dvb-usb/dib0700_devices.c +6 -0
index d7d55a20e959..c170523226aa 100644

Lines of this file are not shown. View the raw message.

drivers/media/v4l2-core/videobuf2-core.c +23 -10
index 66ada01c796c..cf9d644a8aff 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/card/block.c +7 -3
index 60f7141a6b02..31d2627d9d4d 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/host/sdhci.c +5 -4
index 9231cdfe2757..d3dbb28057e9 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/e1000e/82571.c +1 -1
index dc79ed85030b..32e77755a9c6 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/e1000e/ich8lan.c +5 -5
index 9d81c0317433..e2498dbf3c3b 100644

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/intel/e1000e/netdev.c +8 -10
index c509a5c900f5..68913d103542 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/htc.h +3 -3
index e82a0d4ce23f..5dbc617ecf8a 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/ath/ath9k/main.c +7 -5
index b0badef71ce7..d5f2fbf62d72 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/iwlwifi/mvm/debugfs.c +3 -2
index 9ac04c1ea706..8c17b943cc6f 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/iwlwifi/mvm/mac80211.c +1 -1
index dda9f7b5f342..60c138a9bf4f 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/iwlwifi/mvm/mvm.h +1 -0
index cf70f681d1ac..6af21daaaaef 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/iwlwifi/mvm/time-event.c +9 -6
index fd7b0d36f9a6..a7448cf01688 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/rtlwifi/rtl8188ee/hw.c +0 -16
index 86ce5b1930e6..e5d8108f1987 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/rtlwifi/rtl8192ee/hw.c +0 -17
index da0a6125f314..cbf2ca7c7c6d 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/rtlwifi/rtl8723ae/hw.c +0 -13
index 67bb47d77b68..a4b7eac6856f 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/rtlwifi/rtl8723be/hw.c +0 -17
index b681af3c7a35..b9417268427e 100644

Lines of this file are not shown. View the raw message.

drivers/net/wireless/rtlwifi/rtl8821ae/hw.c +0 -20
index 8704eee9f3a4..57966e3c8e8d 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/st21nfcb/i2c.c +0 -10
index 76a4cad41cec..c44f8cf5391a 100644

Lines of this file are not shown. View the raw message.

drivers/nfc/st21nfcb/st21nfcb.c +0 -3
index ca9871ab3fb3..c7dc282d5c3b 100644

Lines of this file are not shown. View the raw message.

drivers/of/address.c +1 -1
index 6906a3f61bd8..8bfda6ade2c0 100644

Lines of this file are not shown. View the raw message.

drivers/of/base.c +1 -1
index f0650265febf..5ed97246c2e7 100644

Lines of this file are not shown. View the raw message.

drivers/phy/phy-berlin-usb.c +2 -2
index c6fc95b53083..ab54f2864451 100644

Lines of this file are not shown. View the raw message.

drivers/phy/phy-twl4030-usb.c +0 -1
index bc42d6a8939f..8882afbef688 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/mvebu/pinctrl-armada-370.c +2 -2
index 03aa58c4cb85..1eb084c3b0c9 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/mvebu/pinctrl-armada-375.c +1 -3
index ca1e7571fedb..203291bde608 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/mvebu/pinctrl-armada-38x.c +21 -30

51 lines not on this page · raw message

drivers/pinctrl/mvebu/pinctrl-armada-39x.c +1 -1
index 42491624d660..2dcf9b41e01e 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/mvebu/pinctrl-armada-xp.c +11 -26
index 578db9f033b2..d7cdb146f44d 100644

Lines of this file are not shown. View the raw message.

drivers/pinctrl/pinctrl-zynq.c +6 -5
index 22280bddb9e2..8c51a3c65513 100644

Lines of this file are not shown. View the raw message.

drivers/platform/x86/dell-laptop.c +3 -5
index d688d806a8a5..2c1d5f5432a9 100644

Lines of this file are not shown. View the raw message.

drivers/platform/x86/ideapad-laptop.c +9 -1
index b496db87bc05..cb7cd8d79329 100644

Lines of this file are not shown. View the raw message.

drivers/pnp/system.c +9 -26
index 515f33882ab8..49c1720df59a 100644

Lines of this file are not shown. View the raw message.

drivers/rtc/rtc-snvs.c +21 -9
index 0479e807a776..d87a85cefb66 100644

Lines of this file are not shown. View the raw message.

drivers/staging/comedi/drivers/cb_pcimdas.c +4 -4
index c458e5010a74..4ebf5aae5019 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8712/rtl8712_recv.c +2 -1
index 50227b598e0c..fcb8c61b2884 100644

Lines of this file are not shown. View the raw message.

drivers/staging/vt6655/device_main.c +5 -1
index 0343ae386f03..15baacb126ad 100644

Lines of this file are not shown. View the raw message.

drivers/staging/vt6656/main_usb.c +1 -1
index ab3ab84cb0a7..766fdcece074 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/Kconfig +1 -1
index f8120c1bde14..8cd35348fc19 100644

Lines of this file are not shown. View the raw message.

drivers/tty/serial/atmel_serial.c +3 -6
index 27dade29646b..5ca1dfb0561c 100644

Lines of this file are not shown. View the raw message.

drivers/tty/sysrq.c +1 -18
index 843f2cdc280b..9ffdfcf2ec6e 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/devio.c +1 -1
index 4b0448c26810..986abde07683 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/hcd.c +5 -2
index 45a915ccd71c..1c1385e3a824 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/hub.c +34 -50

84 lines not on this page · raw message

drivers/usb/core/usb.h +1 -0
index 7eb1e26798e5..457255a3306a 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/ep0.c +4 -0
index 2ef3c8d6a9db..69e769c35cf5 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/gadget.c +9 -1
index 8946c32047e9..333a7c0078fc 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/composite.c +7 -4
index 4e3447bbd097..58b4657fc721 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_fs.c +4 -2
index 45b8c8b338df..6e7be91e6097 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_mass_storage.c +13 -3
index 3cc109f3c9c8..15c307155037 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/udc/mv_udc_core.c +1 -1
index d32160d6463f..5da37c957b53 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/ohci-q.c +1 -6
index 1463c398d322..fe1d5fc7da2d 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-mem.c +1 -1
index f8336408ef07..3e442f77a2b9 100644

Lines of this file are not shown. View the raw message.

drivers/usb/musb/musb_virthub.c +1 -3
index 86c4b533e90b..4731baca377f 100644

Lines of this file are not shown. View the raw message.

drivers/usb/phy/phy-mxs-usb.c +3 -0
index 8f7cb068d29b..3fcc0483a081 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/cp210x.c +1 -0
index ffd739e31bfc..eac7ccaa3c85 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/option.c +1 -0
index f0c0c53359ad..19b85ee98a72 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/usb-serial.c +1 -0
index 529066bbc7e8..46f1f13b41f1 100644

Lines of this file are not shown. View the raw message.

drivers/w1/slaves/w1_therm.c +47 -15

62 lines not on this page · raw message

drivers/watchdog/omap_wdt.c +7 -0
index 1e6be9e40577..c9c97dacf452 100644

Lines of this file are not shown. View the raw message.

fs/9p/vfs_inode.c +1 -2
index 703342e309f5..53f1e8a21707 100644

Lines of this file are not shown. View the raw message.

fs/9p/vfs_inode_dotl.c +1 -2
index 9861c7c951a6..4d3ecfb55fcf 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/inode-map.c +12 -5
index f6a596d5a637..d4a582ac3f73 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/ioctl.c +18 -4
index 1c22c6518504..37d456a9a3b8 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/transaction.c +2 -2
index 5628e25250c0..94e909c5a503 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/tree-log.c +9 -5
index d04968374e9d..4920fceffacb 100644

Lines of this file are not shown. View the raw message.

fs/ext4/extents.c +3 -3
index e003a1e81dc3..87ba10d1d3bc 100644

Lines of this file are not shown. View the raw message.

fs/ext4/indirect.c +1 -1
index 958824019509..94ae6874c2cb 100644

Lines of this file are not shown. View the raw message.

fs/ext4/inode.c +37 -8

45 lines not on this page · raw message

fs/ext4/mballoc.c +5 -11
index 8d1e60214ef0..41260489d3bc 100644

Lines of this file are not shown. View the raw message.

fs/ext4/migrate.c +14 -3
index b52374e42102..6163ad21cb0e 100644

Lines of this file are not shown. View the raw message.

fs/ext4/super.c +4 -0
index ca9d4a2fed41..ca12affdba96 100644

Lines of this file are not shown. View the raw message.

fs/fuse/inode.c +1 -1
index 18dacf9ed8ff..708d697113fc 100644

Lines of this file are not shown. View the raw message.

fs/hpfs/super.c +12 -6
index 7cd00d3a7c9b..8685c655737f 100644

Lines of this file are not shown. View the raw message.

fs/jbd2/checkpoint.c +3 -4
index 988b32ed4c87..4227dc4f7437 100644

Lines of this file are not shown. View the raw message.

fs/jbd2/journal.c +31 -7
index b96bd8076b70..112fad9e1e20 100644

Lines of this file are not shown. View the raw message.

fs/nfs/flexfilelayout/flexfilelayout.c +1 -1
index 7d05089e52d6..6f5f0f425e86 100644

Lines of this file are not shown. View the raw message.

fs/nfs/flexfilelayout/flexfilelayoutdev.c +4 -3
index 77a2d026aa12..f13e1969eedd 100644

Lines of this file are not shown. View the raw message.

fs/nfs/nfs3xdr.c +1 -1
index 53852a4bd88b..9b04c2e6fffc 100644

Lines of this file are not shown. View the raw message.

fs/nfs/nfs4state.c +2 -0
index 2782cfca2265..ddef1dc80cf7 100644

Lines of this file are not shown. View the raw message.

fs/nfs/pnfs.c +3 -0
index 230606243be6..d47c188682b1 100644

Lines of this file are not shown. View the raw message.

fs/nfs/write.c +1 -0
index dfc19f1575a1..daf355642845 100644

Lines of this file are not shown. View the raw message.

fs/overlayfs/readdir.c +49 -28

77 lines not on this page · raw message

fs/xfs/xfs_attr_inactive.c +8 -2
index 3fbf167cfb4c..73e75a87af50 100644

Lines of this file are not shown. View the raw message.

fs/xfs/xfs_symlink.c +1 -1
index 3df411eadb86..40c076523cfa 100644

Lines of this file are not shown. View the raw message.

include/acpi/acpixf.h +11 -2
index 08ef57bc8d63..f5ed1f17f061 100644

Lines of this file are not shown. View the raw message.

include/acpi/actypes.h +1 -0
index 1c3002e1db20..181427ef3549 100644

Lines of this file are not shown. View the raw message.

include/drm/drm_atomic.h +12 -12
index c157103492b0..3f13b910f8d2 100644

Lines of this file are not shown. View the raw message.

include/drm/drm_crtc.h +2 -0
index ca71c03143d1..54233583c6cb 100644

Lines of this file are not shown. View the raw message.

include/drm/drm_dp_mst_helper.h +4 -0
index a2507817be41..86d0b25ed054 100644

Lines of this file are not shown. View the raw message.

include/linux/acpi.h +0 -10
index 5da2d2e9d38e..4550be3bb63b 100644

Lines of this file are not shown. View the raw message.

include/linux/ata.h +1 -0
index b666b773e111..533dbb6428f5 100644

Lines of this file are not shown. View the raw message.

include/linux/buffer_head.h +7 -0
index 73b45225a7ca..e6797ded700e 100644

Lines of this file are not shown. View the raw message.

include/linux/compiler-intel.h +2 -0
index 0c9a2f2c2802..d4c71132d07f 100644

Lines of this file are not shown. View the raw message.

include/linux/gpio/consumer.h +15 -0
index 3a7c9ffd5ab9..da042657dc31 100644

Lines of this file are not shown. View the raw message.

include/linux/hid-sensor-hub.h +1 -0
index 0042bf330b99..c02b5ce6c5cd 100644

Lines of this file are not shown. View the raw message.

include/linux/jbd2.h +2 -2
index 20e7f78041c8..edb640ae9a94 100644

Lines of this file are not shown. View the raw message.

include/linux/libata.h +3 -0
index 28aeae46f355..e0e33787c485 100644

Lines of this file are not shown. View the raw message.

include/linux/nfs_xdr.h +1 -1
index 93ab6071bbe9..e9e9a8dcfb47 100644

Lines of this file are not shown. View the raw message.

include/linux/of.h +4 -1
index b871ff9d81d7..8135d507d089 100644

Lines of this file are not shown. View the raw message.

include/uapi/drm/i915_drm.h +8 -0
index 551b6737f5df..a7e41fb6ed54 100644

Lines of this file are not shown. View the raw message.

kernel/power/Kconfig +1 -1
index 7e01f78f0417..9e302315e33d 100644

Lines of this file are not shown. View the raw message.

kernel/printk/printk.c +4 -7
index c099b082cd02..bff0169e1ad8 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace.h +2 -1
index d2612016de94..921691c5cb04 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace_branch.c +10 -7
index 57cbf1efdd44..1879980f06c2 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace_events_filter.c +9 -1
index 7f2e97ce71a7..52adf02d7619 100644

Lines of this file are not shown. View the raw message.

lib/bitmap.c +9 -8
index 64c0926f5dd8..40162f87ea2d 100644

Lines of this file are not shown. View the raw message.

mm/hugetlb.c +11 -8
index 271e4432734c..8c4c1f9f9a9a 100644

Lines of this file are not shown. View the raw message.

mm/memory.c +13 -7
index 22e037e3364e..2a9e09870c20 100644

Lines of this file are not shown. View the raw message.

net/9p/client.c +3 -1
index 6f4c4c88db84..81925b923318 100644

Lines of this file are not shown. View the raw message.

net/bluetooth/hci_sock.c +19 -7
index 56f9edbf3d05..e11a5cfda4b1 100644

Lines of this file are not shown. View the raw message.

net/ceph/osdmap.c +1 -1
index 15796696d64e..4a3125836b64 100644

Lines of this file are not shown. View the raw message.

net/ieee802154/socket.c +6 -0
index b60c65f70346..627a2537634e 100644

Lines of this file are not shown. View the raw message.

net/mac80211/cfg.c +1 -0
index ff347a0eebd4..f06d42267306 100644

Lines of this file are not shown. View the raw message.

net/mac80211/ibss.c +1 -0
index bfef1b215050..a9c9d961f039 100644

Lines of this file are not shown. View the raw message.

net/mac80211/main.c +3 -0
index df3051d96aff..e86daed83c6f 100644

Lines of this file are not shown. View the raw message.

net/mac80211/mesh.c +1 -0
index d4684242e78b..817098add1d6 100644

Lines of this file are not shown. View the raw message.

net/sunrpc/backchannel_rqst.c +1 -1
index 9dd0ea8db463..28504dfd3dad 100644

Lines of this file are not shown. View the raw message.

net/wireless/util.c +1 -1
index 70051ab52f4f..7e4e3fffe7ce 100644

Lines of this file are not shown. View the raw message.

samples/trace_events/trace-events-sample.h +5 -2
index 8965d1bb8811..125d6402f64f 100644

Lines of this file are not shown. View the raw message.

security/integrity/evm/evm_main.c +11 -0
index 10f994307a04..582091498819 100644

Lines of this file are not shown. View the raw message.

security/integrity/ima/ima.h +1 -1
index 8ee997dff139..fc56d4dfa954 100644

Lines of this file are not shown. View the raw message.

security/integrity/ima/ima_fs.c +2 -2
index 461215e5fd31..816d175da79a 100644

Lines of this file are not shown. View the raw message.

security/integrity/ima/ima_policy.c +100 -24

124 lines not on this page · raw message

security/integrity/ima/ima_template_lib.c +2 -1
index bcfc36cbde6a..61fbd0c0d95c 100644

Lines of this file are not shown. View the raw message.

security/keys/keyring.c +5 -3
index e72548b5897e..d33437007ad2 100644

Lines of this file are not shown. View the raw message.

security/selinux/hooks.c +2 -1
index 212070e1de1a..7f8d7f19e044 100644

Lines of this file are not shown. View the raw message.

security/selinux/ss/ebitmap.c +6 -0
index afe6a269ec17..57644b1dc42e 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/max98925.c +1 -1
index 9b5a17de4690..aad664225dc3 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/rt5645.c +2 -2
index be4d741c45ba..2ee44abd56a6 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/tas2552.c +3 -1
index dfb4ff5cc9ea..18558595ba72 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/wm5102.c +1 -1
index 0c6d1bc0526e..d476221dba51 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/wm5110.c +1 -1
index fbaeddb3e903..3ee6cfd0578b 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/wm8737.c +4 -2
index ada9ac1ba2c6..51171e457fa4 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/wm8903.h +1 -1
index db949311c0f2..0bb4a647755d 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/wm8955.c +1 -1
index 00bec915d652..03e04bf6c5ba 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/wm8960.c +1 -1
index e97a7615df85..8d7f63253440 100644

Lines of this file are not shown. View the raw message.

sound/soc/codecs/wm8997.c +1 -1
index a4d11770630c..e7c81baefe66 100644

Lines of this file are not shown. View the raw message.

sound/soc/fsl/imx-wm8962.c +1 -1
index cd146d4fa805..b38b98cae855 100644

Lines of this file are not shown. View the raw message.

sound/soc/omap/Kconfig +3 -2
index 6768e4f7d7d0..30d0109703a9 100644

Lines of this file are not shown. View the raw message.

sound/soc/qcom/Kconfig +0 -2
index 5f58e4f1bca9..b07f183fc47f 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/cloexec.c +4 -0
index 85b523885f9d..2babddaa2481 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.