Skip to contentSkip to conversation

Linux 4.7.2

DISCUSSION Greg KH 1 participant 2 messages Aug 20, 2016 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 4.7.2 kernel.

All users of the 4.7 kernel series must upgrade.

The updated 4.7.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.7.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/module-signing.txt                            |    6 
 Makefile                                                    |    2 
 arch/arc/include/asm/pgtable.h                              |    2 
 arch/arc/mm/dma.c                                           |    3 
 arch/arm/boot/dts/arm-realview-pbx-a9.dts                   |    9 
 arch/arm/boot/dts/sun4i-a10-a1000.dts                       |    1 
 arch/arm/boot/dts/sun4i-a10-hackberry.dts                   |    1 
 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts                  |    1 
 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts                    |    1 
 arch/arm/boot/dts/tegra124-jetson-tk1.dts                   |    4 
 arch/arm/configs/aspeed_g4_defconfig                        |    2 
 arch/arm/configs/aspeed_g5_defconfig                        |    2 
 arch/arm/mm/dma-mapping.c                                   |   62 +
 arch/arm64/Kconfig                                          |    2 
 arch/arm64/boot/dts/rockchip/rk3368.dtsi                    |    2 
 arch/arm64/kernel/debug-monitors.c                          |    1 
 arch/arm64/kernel/hibernate.c                               |   82 +-
 arch/arm64/kernel/smp.c                                     |   10 
 arch/arm64/kernel/vmlinux.lds.S                             |    4 
 arch/arm64/kvm/hyp/sysreg-sr.c                              |    8 
 arch/arm64/kvm/inject_fault.c                               |   12 
 arch/arm64/mm/mmu.c                                         |    8 
 arch/arm64/mm/proc.S                                        |    2 
 arch/metag/include/asm/cmpxchg_lnkget.h                     |    2 
 arch/mips/kernel/cevt-r4k.c                                 |    7 
 arch/mips/kernel/csrc-r4k.c                                 |    4 
 arch/mips/kvm/emulate.c                                     |   40 -
 arch/mips/kvm/tlb.c                                         |   66 +
 arch/mips/loongson64/loongson-3/hpet.c                      |   14 
 arch/mips/mm/uasm-mips.c                                    |    2 
 arch/powerpc/kernel/tm.S                                    |    3 
 arch/powerpc/kvm/book3s_hv_rmhandlers.S                     |  462 ++++++------
 arch/s390/include/asm/pgtable.h                             |    2 
 arch/s390/include/asm/tlbflush.h                            |    3 
 arch/s390/mm/gmap.c                                         |    4 
 arch/s390/mm/pgtable.c                                      |    2 
 arch/um/os-Linux/signal.c                                   |    5 
 arch/unicore32/include/asm/mmu_context.h                    |    2 
 arch/x86/events/intel/uncore_snbep.c                        |   10 
 arch/x86/kvm/mtrr.c                                         |    1 
 arch/x86/kvm/vmx.c                                          |   20 
 arch/x86/kvm/x86.c                                          |   45 -
 arch/x86/pci/intel_mid_pci.c                                |   12 
 block/bio.c                                                 |   15 
 block/genhd.c                                               |    2 
 drivers/acpi/ec.c                                           |   41 -
 drivers/bcma/host_pci.c                                     |    1 
 drivers/block/floppy.c                                      |   21 
 drivers/bluetooth/ath3k.c                                   |    2 
 drivers/bluetooth/btusb.c                                   |    1 
 drivers/char/random.c                                       |   33 
 drivers/char/tpm/tpm_crb.c                                  |    2 
 drivers/clk/rockchip/clk-rk3399.c                           |    2 
 drivers/cpufreq/intel_pstate.c                              |    2 
 drivers/edac/edac_mc_sysfs.c                                |   20 
 drivers/gpio/gpio-intel-mid.c                               |   21 
 drivers/gpio/gpio-pca953x.c                                 |    2 
 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c                |   25 
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c            |    5 
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c              |    7 
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c                  |   16 
 drivers/gpu/drm/amd/amdgpu/atombios_encoders.c              |    1 
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c                       |    1 
 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c            |    4 
 drivers/gpu/drm/drm_cache.c                                 |    1 
 drivers/gpu/drm/drm_dp_helper.c                             |    2 
 drivers/gpu/drm/drm_edid.c                                  |    8 
 drivers/gpu/drm/i915/i915_drv.h                             |    2 
 drivers/gpu/drm/i915/i915_reg.h                             |    5 
 drivers/gpu/drm/i915/intel_display.c                        |   22 
 drivers/gpu/drm/i915/intel_pm.c                             |    3 
 drivers/gpu/drm/i915/intel_ringbuffer.c                     |   14 
 drivers/gpu/drm/nouveau/nouveau_drm.c                       |   11 
 drivers/gpu/drm/nouveau/nv04_fbcon.c                        |    4 
 drivers/gpu/drm/nouveau/nv50_fbcon.c                        |    2 
 drivers/gpu/drm/nouveau/nvc0_fbcon.c                        |    2 
 drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c               |    4 
 drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c               |    4 
 drivers/gpu/drm/radeon/atombios_encoders.c                  |    1 
 drivers/gpu/drm/radeon/radeon_atombios.c                    |    4 
 drivers/gpu/drm/radeon/radeon_atpx_handler.c                |    5 
 drivers/gpu/drm/radeon/radeon_connectors.c                  |   15 
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c                 |   13 
 drivers/hid/uhid.c                                          |   33 
 drivers/hv/vmbus_drv.c                                      |    3 
 drivers/i2c/busses/i2c-efm32.c                              |    2 
 drivers/infiniband/core/rw.c                                |   24 
 drivers/infiniband/core/verbs.c                             |    9 
 drivers/infiniband/hw/mlx5/gsi.c                            |   19 
 drivers/infiniband/sw/rdmavt/Kconfig                        |    1 
 drivers/infiniband/sw/rdmavt/cq.c                           |    1 
 drivers/infiniband/ulp/srpt/ib_srpt.c                       |    3 
 drivers/infiniband/ulp/srpt/ib_srpt.h                       |    6 
 drivers/input/mouse/elan_i2c_core.c                         |   79 +-
 drivers/input/touchscreen/sur40.c                           |    5 
 drivers/iommu/amd_iommu.c                                   |   40 -
 drivers/iommu/exynos-iommu.c                                |    1 
 drivers/iommu/intel-iommu.c                                 |    2 
 drivers/iommu/io-pgtable-arm.c                              |    2 
 drivers/md/dm-flakey.c                                      |   23 
 drivers/md/dm-verity-fec.c                                  |    4 
 drivers/md/dm.c                                             |   16 
 drivers/media/dvb-core/dvb_ringbuffer.c                     |   74 +
 drivers/media/platform/s5p-mfc/s5p_mfc.c                    |   11 
 drivers/media/rc/ir-rc5-decoder.c                           |    2 
 drivers/media/rc/nuvoton-cir.c                              |    1 
 drivers/media/usb/usbtv/usbtv-audio.c                       |    5 
 drivers/media/v4l2-core/videobuf2-core.c                    |   10 
 drivers/media/v4l2-core/videobuf2-v4l2.c                    |    6 
 drivers/mfd/qcom_rpm.c                                      |   55 +
 drivers/mtd/nand/nand_base.c                                |    2 
 drivers/mtd/ubi/build.c                                     |   13 
 drivers/mtd/ubi/vmt.c                                       |   25 
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c |   22 
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c               |    9 
 drivers/net/wireless/intel/iwlwifi/pcie/internal.h          |   21 
 drivers/net/wireless/intel/iwlwifi/pcie/rx.c                |   16 
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c             |   13 
 drivers/of/base.c                                           |   30 
 drivers/of/dynamic.c                                        |    2 
 drivers/of/of_private.h                                     |    3 
 drivers/pci/quirks.c                                        |   10 
 drivers/phy/phy-rcar-gen3-usb2.c                            |   26 
 drivers/pinctrl/intel/pinctrl-cherryview.c                  |   80 +-
 drivers/platform/x86/hp-wmi.c                               |    7 
 drivers/regulator/s2mps11.c                                 |    6 
 drivers/remoteproc/remoteproc_core.c                        |   15 
 drivers/rtc/rtc-s3c.c                                       |    2 
 drivers/s390/cio/cmf.c                                      |   29 
 drivers/scsi/lpfc/lpfc_scsi.c                               |    2 
 drivers/scsi/megaraid/megaraid_sas_base.c                   |    6 
 drivers/soc/qcom/smp2p.c                                    |    3 
 drivers/spi/spi-pxa2xx.c                                    |    9 
 drivers/target/iscsi/iscsi_target.c                         |   22 
 drivers/target/iscsi/iscsi_target_login.c                   |    5 
 drivers/target/target_core_device.c                         |    8 
 drivers/target/target_core_file.c                           |    3 
 drivers/target/target_core_iblock.c                         |    3 
 drivers/target/target_core_internal.h                       |    1 
 drivers/target/target_core_sbc.c                            |    2 
 drivers/target/target_core_transport.c                      |   78 +-
 drivers/tty/serial/atmel_serial.c                           |   14 
 drivers/tty/serial/msm_serial.c                             |    2 
 drivers/tty/serial/samsung.c                                |   18 
 drivers/usb/core/quirks.c                                   |    3 
 drivers/usb/dwc3/gadget.c                                   |   16 
 drivers/usb/gadget/udc/atmel_usba_udc.c                     |    2 
 drivers/usb/gadget/udc/pch_udc.c                            |   16 
 drivers/usb/renesas_usbhs/fifo.c                            |   18 
 drivers/usb/renesas_usbhs/mod_gadget.c                      |    9 
 drivers/usb/serial/option.c                                 |    3 
 drivers/virtio/virtio_balloon.c                             |    2 
 drivers/w1/masters/omap_hdq.c                               |    2 
 fs/btrfs/extent_io.c                                        |    6 
 fs/btrfs/file.c                                             |   12 
 fs/cachefiles/namei.c                                       |    5 
 fs/cifs/cifs_fs_sb.h                                        |    4 
 fs/cifs/cifsencrypt.c                                       |   16 
 fs/cifs/cifsfs.c                                            |   14 
 fs/cifs/connect.c                                           |   53 +
 fs/cifs/dir.c                                               |   44 +
 fs/cifs/inode.c                                             |   22 
 fs/cifs/smb2ops.c                                           |   30 
 fs/jbd2/commit.c                                            |    2 
 fs/nfs/nfs4proc.c                                           |   57 -
 fs/nfs/pnfs.c                                               |   35 
 fs/nfs/write.c                                              |    5 
 fs/nfsd/nfs4state.c                                         |   65 +
 fs/overlayfs/super.c                                        |    3 
 fs/xfs/xfs_aops.c                                           |   15 
 include/linux/backing-dev-defs.h                            |    1 
 include/linux/backing-dev.h                                 |    1 
 include/linux/bio.h                                         |    3 
 include/linux/mlx5/qp.h                                     |    4 
 include/rdma/ib_verbs.h                                     |    6 
 include/target/target_core_backend.h                        |    2 
 include/target/target_core_base.h                           |    1 
 include/target/target_core_fabric.h                         |    1 
 include/trace/events/sunrpc.h                               |   47 -
 kernel/auditsc.c                                            |  332 ++++----
 kernel/cgroup.c                                             |   18 
 kernel/module.c                                             |   13 
 mm/backing-dev.c                                            |   19 
 mm/hugetlb.c                                                |    4 
 net/bluetooth/l2cap_sock.c                                  |    2 
 net/netlabel/netlabel_kapi.c                                |   12 
 scripts/recordmcount.c                                      |    9 
 sound/hda/array.c                                           |    4 
 sound/pci/hda/hda_intel.c                                   |    2 
 sound/pci/hda/patch_realtek.c                               |   28 
 tools/objtool/.gitignore                                    |    1 
 virt/kvm/kvm_main.c                                         |    2 
 192 files changed, 2086 insertions(+), 1108 deletions(-)

Alex Deucher (7):
drm/amdgpu: add a delay after ATPX dGPU power off drm/amdgpu: support backlight control for UNIPHY3 drm/amdgpu: fix firmware info version checks drm/amdgpu/gmc7: add missing mullins case drm/radeon: add a delay after ATPX dGPU power off drm/radeon: fix firmware info version checks drm/radeon: support backlight control for UNIPHY3

Alex Hung (1):
hp-wmi: Fix wifi cannot be hard-unblocked

Alexandre Belloni (2):
usb: gadget: udc: atmel: Also get regmap for at91sam9x5-pmc tty/serial: atmel: fix RS485 half duplex with DMA

Alexey Khoroshilov (1):
i2c: efm32: fix a failure path in efm32_i2c_probe()

Alexis Dambricourt (1):
KVM: MTRR: fix kvm_mtrr_check_gfn_range_consistency page fault

Alim Akhtar (2):
regulator: s2mps11: Fix the voltage linear range for s2mps15
rtc: s3c: Add s3c_rtc_{enable/disable}_clk in s3c_rtc_setfreq()

Amadeusz Sławiński (1):
Bluetooth: Fix l2cap_sock_setsockopt() with optname BT_RCVMTU

Andrew Jones (1):
arm64: KVM: Set cpsr before spsr on fault injection

Andy Shevchenko (4):
gpio: intel-mid: Remove potentially harmful code
gpio: intel-mid: switch to devm_gpiochip_add_data()
spi: pxa2xx: Clear all RFT bits in reset_sccr1() on Intel Quark x86/platform/intel_mid_pci: Rework IRQ0 workaround

Ard Biesheuvel (2):
arm64: mm: avoid fdt_check_header() before the FDT is fully mapped
arm64: vmlinux.lds: make __rela_offset and __dynsym_offset ABSOLUTE

Arend Van Spriel (1):
brcmfmac: restore stopping netdev queue when bus clogs up

Arnd Bergmann (2):
jbd2: make journal y2038 safe
Revert "ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME"

Artemy Kovalyov (1):
IB/mlx5: Fix MODIFY_QP command input structure

Aurelien Aptel (1):
fs/cifs: make share unaccessible at root level mountable

Bart Van Assche (4):
IB/rdmavt: Disable by default
IB/srpt: Limit the number of SG elements per work request IB/core: Make rdma_rw_ctx_init() initialize all used fields IB/core, RDMA RW API: Do not exceed QP SGE send limit

Ben Hutchings (2):
module: Invalidate signatures on force-loaded modules Documentation/module-signing.txt: Note need for version info if reusing a key

Ben Skeggs (1):
drm/nouveau: check for supported chipset before booting fbdev off the hw

Benjamin Coddington (1):
nfs: don't create zero-length requests

Bjorn Andersson (2):
tty: serial: msm: Don't read off end of tx fifo
soc: qcom: smp2p: Correct addressing of outgoing value

Borislav Petkov (1):
EDAC: Correct channel count limit

Caesar Wang (1):
arm64: dts: rockchip: fixes the gic400 2nd region size for rk3368

Cao, Lei (1):
KVM: VMX: handle PML full VMEXIT that occurs during event delivery

Catalin Marinas (1):
arm64: Only select ARM64_MODULE_PLTS if MODULES=y

Chris Blake (1):
PCI: Mark Atheros AR9485 and QCA9882 to avoid bus reset

Chris Mason (1):
Btrfs: fix delalloc accounting after copy_from_user faults

Chris Wilson (1):
drm: Restore double clflush on the last partial cacheline

Chuck Lever (1):
nfsd: Fix race between FREE_STATEID and LOCK

Dan O'Donovan (1):
pinctrl: cherryview: prevent concurrent access to GPIO controllers

Dan Williams (1):
block: fix bdi vs gendisk lifetime mismatch

Daniele Palmas (1):

      USB: serial: option: add support for Telit LE910 PID 0x1206

Dave Chinner (1):
xfs: bufferhead chains are invalid after end_page_writeback

Dave Gerlach (1):
remoteproc: Fix potential race condition in rproc_add

David Hildenbrand (2):
s390/mm: fix gmap tlb flush issues s390/mm: don't drop errors in get_guest_storage_key

David Howells (1):
cachefiles: Fix race between inactivating and culling a cache object

Dmitry Tunin (1):

      Bluetooth: Add support of 13d3:3490 AR3012 device

Emmanuel Grumbach (2):
iwlwifi: pcie: enable interrupts before releasing the NIC's CPU
iwlwifi: pcie: fix a race in firmware loading flow

Eric Biggers (1):
random: properly align get_random_int_hash

Eric W. Biederman (3):
cgroupns: Fix the locking in copy_cgroup_ns
cgroupns: Close race between cgroup_post_fork and copy_cgroup_ns
cgroupns: Only allow creation of hierarchies in the initial cgroup namespace

Felipe Balbi (1):
usb: dwc3: gadget: only resume USB2 PHY in <=HIGHSPEED

Feng Li (1):
iscsi-target: Fix panic when adding second TCP connection to iSCSI session

Florian Echtler (2):
sur40: lower poll interval to fix occasional FPS drops to ~56 FPS
sur40: fix occasional oopses on device close

Frank Rowand (1):
of: fix memory leak related to safe_name()

Greg Kroah-Hartman (1):

      Linux 4.7.2

Gregory CLEMENT (1):
ARM: 8561/3: dma-mapping: Don't use outer_flush_range when the L2C is coherent

Guenter Roeck (1):
unicore32: mm: Add missing parameter to arch_vma_access_permitted

H. Nikolaus Schaller (1):
w1:omap_hdq: fix regression

Hans de Goede (1):
ARM: dts: sunxi: Add a startup delay for fixed regulator enabled phys

Hector Palacios (1):
mtd: nand: fix bug writing 1 byte less than page size

Heiner Kallweit (1):
rc: nuvoton: fix hang if chip is configured for alternative EFM IO address

Huacai Chen (3):
MIPS: Fix r4k clockevents registration
MIPS: Don't register r4k sched clock when CPUFREQ enabled
MIPS: hpet: Increase HPET_MIN_PROG_DELTA and decrease HPET_MIN_CYCLES

Huang Rui (1):
drm/amd/powerplay: fix the incorrect return value

Hui Wang (2):
ALSA: hda/realtek - Can't adjust speaker's volume on a Dell AIO
ALSA: hda - Fix headset mic detection problem for two dell machines

Iago Abal (1):
usb: gadget: pch_udc: reorder spin_[un]lock to avoid deadlock

Ilia Mirkin (1):
drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup

Iosif Harutyunov (1):
ubi: Fix race condition between ubi device creation and udev

James Hogan (5):
MIPS: KVM: Fix mapped fault broken commpage handling
MIPS: KVM: Add missing gfn range check
MIPS: KVM: Fix gfn range check in kseg0 tlb faults
MIPS: KVM: Propagate kseg0/mapped tlb fault errors
metag: Fix __cmpxchg_u32 asm constraint for CMP

Jan Kiszka (1):
intel_pstate: Fix MSR_CONFIG_TDP_x addressing in core_get_max_pstate()

Jarkko Sakkinen (1):
tpm_crb: fix address space of the return pointer in crb_map_res()

Javier Martinez Canillas (2):
s5p-mfc: Set device name for reserved memory region devs
s5p-mfc: Add release callback for memory region devs

Jeff Layton (1):
nfsd: don't return an unhashed lock stateid after taking mutex

Jia He (1):
mm/hugetlb: avoid soft lockup in set_max_huge_pages()

Jianxin Xiong (1):

      IB/rdmavt: Add missing spin_lock_init call for rdi->n_cqs_lock

Jim Mattson (1):
KVM: nVMX: Fix memory corruption when using VMCS shadowing

Jiri Kosina (1):
floppy: fix open(O_ACCMODE) for ioctl-only open

Joerg Roedel (3):
iommu/amd: Handle IOMMU_DOMAIN_DMA in ops->domain_free call-back iommu/amd: Init unity mappings only for dma_ops domains iommu/amd: Update Alias-DTE in update_device_table()

John Keeping (1):
drm/rockchip: allocate correct crtc state structure on reset

Jonathan McDowell (1):
Fix RC5 decoding with Fintek CIR chipset

Joseph Salisbury (1):
usb: quirks: Add no-lpm quirk for Elan

KT Liao (1):
Input: elan_i2c - properly wake up touchpad on ASUS laptops

Kan Liang (1):
perf/x86/intel/uncore: Fix uncore num_counters

Konrad Leszczynski (1):
usb: dwc3: fix for the isoc transfer EP_BUSY flag

Konstantin Neumoin (1):
balloon: check the number of available pages in leak balloon

Krzysztof Kozlowski (1):
serial: samsung: Fix ERR pointer dereference on deferred probe

Laura Abbott (1):
ftrace/recordmcount: Work around for addition of metag magic but not relocations

Linus Walleij (2):
mfd: qcom_rpm: Fix offset error for msm8660
mfd: qcom_rpm: Parametrize also ack selector size

Lv Zheng (1):
ACPI / EC: Work around method reentrancy limit in ACPICA for _Qxx

Lyude (3):
drm/amdgpu: Poll for both connect/disconnect on analog connectors drm/amdgpu: Disable RPM helpers while reprobing connectors on resume drm/radeon: Poll for both connect/disconnect on analog connectors

Marc Zyngier (1):
arm64: KVM: VHE: Context switch MDSCR_EL1

Marek Szyprowski (1):
iommu/exynos: Suppress unbinding to prevent system failure

Mario Kleiner (2):
drm/edid: Add 6 bpc quirk for display AEO model 0.
drm/i915/dp: Revert "drm/i915/dp: fall back to 18 bpp when sink capability is unknown"

Mark Rutland (2):
arm64: hibernate: avoid potential TLB conflict
arm64: hibernate: handle allocation failures

Maruthi Srinivas Bayyavarapu (1):
ALSA: hda: add AMD Bonaire AZ PCI ID with proper driver caps

Matt Redfearn (1):
MIPS: mm: Fix definition of R6 cache instruction

Matthew Leach (1):
media: usbtv: prevent access to free'd resources

Mauricio Faria de Oliveira (1):
lpfc: fix oops in lpfc_sli4_scmd_to_wqidx_distr() from lpfc_send_taskmgmt()

Michael Neuling (1):
powerpc/tm: Fix stack pointer corruption in __tm_recheckpoint()

Mika Kuoppala (1):
drm/i915/gen9: Add WaInPlaceDecompressionHang

Mike Christie (1):
target: Fix max_unmap_lba_count calc overflow

Mike Snitzer (2):
dm: set DMF_SUSPENDED* _before_ clearing DMF_NOFLUSH_SUSPENDING dm flakey: error READ bios during the down_interval

Miklos Szeredi (1):
ovl: disallow overlayfs as upperdir

Mikulas Patocka (1):
drm/nouveau/fbcon: fix font width not divisible by 8

Nicholas Bellinger (4):
target: Fix ordered task target_setup_cmd_from_cdb exception hang
target: Fix missing complete during ABORT_TASK + CMD_T_FABRIC_STOP
target: Fix race between iscsi-target connection shutdown + ABORT_TASK
target: Fix ordered task CHECK_CONDITION early exception handling

Oren Givon (2):
iwlwifi: add new 8260 PCI IDs
iwlwifi: add new 8265

Paolo Bonzini (1):
KVM: x86: avoid simultaneous queueing of both IRQ and SMI

Paolo Valente (1):
block: add missing group association in bio-cloning functions

Paul Gortmaker (1):
objtool: Add 'fixdep' to objtool/.gitignore

Paul Mackerras (2):
KVM: PPC: Book3S HV: Pull out TM state save/restore into separate procedures
KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE

Paul Moore (2):
audit: fix a double fetch in audit_log_single_execve_arg()
netlabel: add address family checks to netlbl_{sock,req}_delattr()

Pavel Shilovsky (1):
CIFS: Fix a possible invalid memory access in smb2_query_symlink()

Rabin Vincent (2):
cifs: unbreak TCP session reuse
cifs: fix crash due to race in hmac(md5) handling

Rafał Miłecki (1):
bcma: add PCI ID for Foxconn's BCM43142 device

Ralf Ramsauer (1):
ARM: tegra: fix erroneous address in dts

Richard Weinberger (3):
ubi: Make volume resize power cut aware
ubi: Fix early logging
um: Fix possible deadlock in sig_handler_common()

Robin Murphy (1):
ARM: dts: realview: Fix PBX-A9 cache description

Roderick Colenbrander (1):
HID: uhid: fix timeout when probe races with IO

Sachin Prabhu (1):
cifs: Check for existing directory when opening file with O_CREAT

Sakari Ailus (2):
videobuf2-v4l2: Verify planes array in buffer dequeueing
vb2: core: Skip planes array verification if pb is NULL

Sami Tolvanen (1):
dm verity fec: fix block calculation

Sebastian Ott (1):
s390/cio: allow to reset channel measurement block

Slava Shwartsman (1):
IB/mlx5: Fix iteration overrun in GSI qps

Soeren Moch (1):
media: dvb_ringbuffer: Add memory barriers

Stephan Mueller (1):
random: add interrupt callback to VMBus IRQ handler

Sumit Saxena (1):
megaraid_sas: Do not fire MR_DCMD_PD_LIST_QUERY to controllers which do not support it

Suzuki K Poulose (2):
arm64: Fix incorrect per-cpu usage for boot CPU
arm64: Honor nosmp kernel command line option

Tahsin Erdogan (1):
dm: fix second blk_delay_queue() parameter to be in msec units not jiffies

Takashi Iwai (1):
ALSA: hda: Fix krealloc() with __GFP_ZERO usage

Theodore Ts'o (2):
random: initialize the non-blocking pool via add_hwgenerator_randomness()
random: print a warning for the first ten uninitialized random users

Trond Myklebust (5):
pNFS: Separate handling of NFS4ERR_LAYOUTTRYLATER and RECALLCONFLICT
pNFS: Fix post-layoutget error handling in pnfs_update_layout()
pNFS: Handle NFS4ERR_RECALLCONFLICT correctly in LAYOUTGET
pNFS: Fix LAYOUTGET handling of NFS4ERR_BAD_STATEID and NFS4ERR_EXPIRED
SUNRPC: Don't allocate a full sockaddr_storage for tracing

Vignesh R (1):
gpio: pca953x: Fix NBANK calculation for PCA9536

Ville Syrjälä (3):
drm/i915: Update CDCLK_FREQ register on BDW after changing cdclk frequency
drm: aux ->transfer() can return 0, deal with it
drm/i915: Never fully mask the the EI up rps interrupt on SNB/IVB

Vineet Gupta (1):
ARC: mm: don't loose PTE_SPECIAL in pte_modify()

Vladimir Kondratiev (1):
ARC: dma: fix address translation in arc_dma_free

Wei Yang (1):
iommu/vt-d: Return error code in domain_context_mapping_one()

Will Deacon (2):
arm64: debug: unmask PSTATE.D earlier iommu/io-pgtable-arm: Fix iova_to_phys for block entries

Xing Zheng (1):
clk: rockchip: fix incorrect rk3399 spdif-DPTX divider bits

Yoshihiro Shimoda (3):
usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()
usb: renesas_usbhs: fix NULL pointer dereference in xfer_work()
phy: rcar-gen3-usb2: fix mutex_lock calling in interrupt

author maintainer
#1 lore raw
Documentation/module-signing.txt +6 -0
index 696d5caf4fd8..f0e3361db20c 100644
@@ -271,3 +271,9 @@ Since the private key is used to sign modules, viruses and malware could use
 the private key to sign modules and compromise the operating system.  The
 private key must be either destroyed or moved to a secure location and not kept
 in the root node of the kernel source tree.
+
+If you use the same private key to sign modules for multiple kernel
+configurations, you must ensure that the module version information is
+sufficient to prevent loading a module into a different kernel.  Either
+set CONFIG_MODVERSIONS=y or ensure that each configuration has a different
+kernel release string by changing EXTRAVERSION or CONFIG_LOCALVERSION.
Makefile +1 -1
index 84335c0b2eda..bb98f1ce854e 100644
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 7
-SUBLEVEL = 1
+SUBLEVEL = 2
 EXTRAVERSION =
 NAME = Psychotic Stoned Sheep
 
arch/arc/include/asm/pgtable.h +1 -1
index 858f98ef7f1b..0f92d97432a2 100644
@@ -110,7 +110,7 @@
 #define ___DEF (_PAGE_PRESENT | _PAGE_CACHEABLE)
 
 /* Set of bits not changed in pte_modify */
-#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
+#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_SPECIAL)
 
 /* More Abbrevaited helpers */
 #define PAGE_U_NONE     __pgprot(___DEF)
arch/arc/mm/dma.c +2 -1
index 73d7e4c75b7d..ab74b5d9186c 100644
@@ -92,7 +92,8 @@ static void *arc_dma_alloc(struct device *dev, size_t size,
 static void arc_dma_free(struct device *dev, size_t size, void *vaddr,
 		dma_addr_t dma_handle, struct dma_attrs *attrs)
 {
-	struct page *page = virt_to_page(dma_handle);
+	phys_addr_t paddr = plat_dma_to_phys(dev, dma_handle);
+	struct page *page = virt_to_page(paddr);
 	int is_non_coh = 1;
 
 	is_non_coh = dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs) ||
arch/arm/boot/dts/arm-realview-pbx-a9.dts +4 -5
index db808f92dd79..90d00b407f85 100644
@@ -70,13 +70,12 @@
 		 * associativity as these may be erroneously set
 		 * up by boot loader(s).
 		 */
-		cache-size = <1048576>; // 1MB
-		cache-sets = <4096>;
+		cache-size = <131072>; // 128KB
+		cache-sets = <512>;
 		cache-line-size = <32>;
 		arm,parity-disable;
-		arm,tag-latency = <1>;
-		arm,data-latency = <1 1>;
-		arm,dirty-latency = <1>;
+		arm,tag-latency = <1 1 1>;
+		arm,data-latency = <1 1 1>;
 	};
 
 	scu: scu@1f000000 {
arch/arm/boot/dts/sun4i-a10-a1000.dts +1 -0
index c92a1ae33a1e..fa70b8fbf221 100644
@@ -84,6 +84,7 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>;
 	};
arch/arm/boot/dts/sun4i-a10-hackberry.dts +1 -0
index 2b17c5199151..6de83a6187d0 100644
@@ -66,6 +66,7 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 7 19 GPIO_ACTIVE_HIGH>;
 	};
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts +1 -0
index 7afc7a64eef1..e28f080b1fd5 100644
@@ -80,6 +80,7 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 7 19 GPIO_ACTIVE_HIGH>;   /* PH19 */
 	};
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts +1 -0
index 9fea918f949e..39731a78f087 100644
@@ -79,6 +79,7 @@
 		regulator-name = "emac-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		startup-delay-us = <20000>;
 		enable-active-high;
 		gpio = <&pio 0 2 GPIO_ACTIVE_HIGH>;
 	};
arch/arm/boot/dts/tegra124-jetson-tk1.dts +2 -2
index 941f36263c8f..f4d8125c1bfc 100644
@@ -1386,7 +1386,7 @@
 	 *   Pin 41: BR_UART1_TXD
 	 *   Pin 44: BR_UART1_RXD
 	 */
-	serial@70006000 {
+	serial@0,70006000 {
 		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
 		status = "okay";
 	};
@@ -1398,7 +1398,7 @@
 	 *   Pin 71: UART2_CTS_L
 	 *   Pin 74: UART2_RTS_L
 	 */
-	serial@70006040 {
+	serial@0,70006040 {
 		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
 		status = "okay";
 	};
arch/arm/configs/aspeed_g4_defconfig +1 -1
index b6e54ee9bdbd..ca39c04fec6b 100644
@@ -58,7 +58,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FANOTIFY=y
-CONFIG_PRINTK_TIME=1
+CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_PAGE_POISONING=y
arch/arm/configs/aspeed_g5_defconfig +1 -1
index 892605167357..4f366b0370e9 100644
@@ -59,7 +59,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FANOTIFY=y
-CONFIG_PRINTK_TIME=1
+CONFIG_PRINTK_TIME=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_PAGE_POISONING=y
arch/arm/mm/dma-mapping.c +42 -20

185 lines not on this page · raw message

arch/arm64/Kconfig +1 -1
index 5a0a691d4220..20384925bb0f 100644
@@ -872,7 +872,7 @@ config RELOCATABLE
 
 config RANDOMIZE_BASE
 	bool "Randomize the address of the kernel image"
-	select ARM64_MODULE_PLTS
+	select ARM64_MODULE_PLTS if MODULES
 	select RELOCATABLE
 	help
 	  Randomizes the virtual address at which the kernel image is
arch/arm64/boot/dts/rockchip/rk3368.dtsi +1 -1
index 8b4a7c9154e9..080203e3aa2f 100644
@@ -670,7 +670,7 @@
 		#address-cells = <0>;
 
 		reg = <0x0 0xffb71000 0x0 0x1000>,
-		      <0x0 0xffb72000 0x0 0x1000>,
+		      <0x0 0xffb72000 0x0 0x2000>,
 		      <0x0 0xffb74000 0x0 0x2000>,
 		      <0x0 0xffb76000 0x0 0x2000>;
 		interrupts = <GIC_PPI 9
arch/arm64/kernel/debug-monitors.c +0 -1
index 4fbf3c54275c..0800d23e2fdd 100644
@@ -151,7 +151,6 @@ static int debug_monitors_init(void)
 	/* Clear the OS lock. */
 	on_each_cpu(clear_os_lock, NULL, 1);
 	isb();
-	local_dbg_enable();
 
 	/* Register hotplug handler. */
 	__register_cpu_notifier(&os_lock_nb);
arch/arm64/kernel/hibernate.c +49 -33

112 lines not on this page · raw message

arch/arm64/kernel/smp.c +8 -2
index 62ff3c0622e2..490db85dec23 100644
@@ -267,7 +267,6 @@ asmlinkage void secondary_start_kernel(void)
 	set_cpu_online(cpu, true);
 	complete(&cpu_running);
 
-	local_dbg_enable();
 	local_irq_enable();
 	local_async_enable();
 
@@ -437,9 +436,9 @@ void __init smp_cpus_done(unsigned int max_cpus)
 
 void __init smp_prepare_boot_cpu(void)
 {
+	set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
 	cpuinfo_store_boot_cpu();
 	save_boot_cpu_run_el();
-	set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
 }
 
 static u64 __init of_get_cpu_mpidr(struct device_node *dn)
@@ -694,6 +693,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	smp_store_cpu_info(smp_processor_id());
 
 	/*
+	 * If UP is mandated by "nosmp" (which implies "maxcpus=0"), don't set
+	 * secondary CPUs present.
+	 */
+	if (max_cpus == 0)
+		return;
+
+	/*
 	 * Initialise the present map (which describes the set of CPUs
 	 * actually populated at the present time) and release the
 	 * secondaries from the bootloader.
arch/arm64/kernel/vmlinux.lds.S +2 -2
index 435e820e898d..e564d4595998 100644
@@ -181,9 +181,9 @@ SECTIONS
 		*(.hash)
 	}
 
-	__rela_offset	= ADDR(.rela) - KIMAGE_VADDR;
+	__rela_offset	= ABSOLUTE(ADDR(.rela) - KIMAGE_VADDR);
 	__rela_size	= SIZEOF(.rela);
-	__dynsym_offset	= ADDR(.dynsym) - KIMAGE_VADDR;
+	__dynsym_offset	= ABSOLUTE(ADDR(.dynsym) - KIMAGE_VADDR);
 
 	. = ALIGN(SEGMENT_ALIGN);
 	__init_end = .;
arch/arm64/kvm/hyp/sysreg-sr.c +4 -4
index 0f7c40eb3f53..934137647837 100644
@@ -27,8 +27,8 @@ static void __hyp_text __sysreg_do_nothing(struct kvm_cpu_context *ctxt) { }
 /*
  * Non-VHE: Both host and guest must save everything.
  *
- * VHE: Host must save tpidr*_el[01], actlr_el1, sp0, pc, pstate, and
- * guest must save everything.
+ * VHE: Host must save tpidr*_el[01], actlr_el1, mdscr_el1, sp0, pc,
+ * pstate, and guest must save everything.
  */
 
 static void __hyp_text __sysreg_save_common_state(struct kvm_cpu_context *ctxt)
@@ -37,6 +37,7 @@ static void __hyp_text __sysreg_save_common_state(struct kvm_cpu_context *ctxt)
 	ctxt->sys_regs[TPIDR_EL0]	= read_sysreg(tpidr_el0);
 	ctxt->sys_regs[TPIDRRO_EL0]	= read_sysreg(tpidrro_el0);
 	ctxt->sys_regs[TPIDR_EL1]	= read_sysreg(tpidr_el1);
+	ctxt->sys_regs[MDSCR_EL1]	= read_sysreg(mdscr_el1);
 	ctxt->gp_regs.regs.sp		= read_sysreg(sp_el0);
 	ctxt->gp_regs.regs.pc		= read_sysreg_el2(elr);
 	ctxt->gp_regs.regs.pstate	= read_sysreg_el2(spsr);
@@ -61,7 +62,6 @@ static void __hyp_text __sysreg_save_state(struct kvm_cpu_context *ctxt)
 	ctxt->sys_regs[AMAIR_EL1]	= read_sysreg_el1(amair);
 	ctxt->sys_regs[CNTKCTL_EL1]	= read_sysreg_el1(cntkctl);
 	ctxt->sys_regs[PAR_EL1]		= read_sysreg(par_el1);
-	ctxt->sys_regs[MDSCR_EL1]	= read_sysreg(mdscr_el1);
 
 	ctxt->gp_regs.sp_el1		= read_sysreg(sp_el1);
 	ctxt->gp_regs.elr_el1		= read_sysreg_el1(elr);
@@ -90,6 +90,7 @@ static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctx
 	write_sysreg(ctxt->sys_regs[TPIDR_EL0],	  tpidr_el0);
 	write_sysreg(ctxt->sys_regs[TPIDRRO_EL0], tpidrro_el0);
 	write_sysreg(ctxt->sys_regs[TPIDR_EL1],	  tpidr_el1);
+	write_sysreg(ctxt->sys_regs[MDSCR_EL1],	  mdscr_el1);
 	write_sysreg(ctxt->gp_regs.regs.sp,	  sp_el0);
 	write_sysreg_el2(ctxt->gp_regs.regs.pc,	  elr);
 	write_sysreg_el2(ctxt->gp_regs.regs.pstate, spsr);
@@ -114,7 +115,6 @@ static void __hyp_text __sysreg_restore_state(struct kvm_cpu_context *ctxt)
 	write_sysreg_el1(ctxt->sys_regs[AMAIR_EL1],	amair);
 	write_sysreg_el1(ctxt->sys_regs[CNTKCTL_EL1], 	cntkctl);
 	write_sysreg(ctxt->sys_regs[PAR_EL1],		par_el1);
-	write_sysreg(ctxt->sys_regs[MDSCR_EL1],		mdscr_el1);
 
 	write_sysreg(ctxt->gp_regs.sp_el1,		sp_el1);
 	write_sysreg_el1(ctxt->gp_regs.elr_el1,		elr);
arch/arm64/kvm/inject_fault.c +5 -7
index e9e0e6db73f6..898c0e6aedd4 100644
@@ -132,16 +132,14 @@ static u64 get_except_vector(struct kvm_vcpu *vcpu, enum exception_type type)
 static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr)
 {
 	unsigned long cpsr = *vcpu_cpsr(vcpu);
-	bool is_aarch32;
+	bool is_aarch32 = vcpu_mode_is_32bit(vcpu);
 	u32 esr = 0;
 
-	is_aarch32 = vcpu_mode_is_32bit(vcpu);
-
-	*vcpu_spsr(vcpu) = cpsr;
 	*vcpu_elr_el1(vcpu) = *vcpu_pc(vcpu);
-
 	*vcpu_pc(vcpu) = get_except_vector(vcpu, except_type_sync);
+
 	*vcpu_cpsr(vcpu) = PSTATE_FAULT_BITS_64;
+	*vcpu_spsr(vcpu) = cpsr;
 
 	vcpu_sys_reg(vcpu, FAR_EL1) = addr;
 
@@ -172,11 +170,11 @@ static void inject_undef64(struct kvm_vcpu *vcpu)
 	unsigned long cpsr = *vcpu_cpsr(vcpu);
 	u32 esr = (ESR_ELx_EC_UNKNOWN << ESR_ELx_EC_SHIFT);
 
-	*vcpu_spsr(vcpu) = cpsr;
 	*vcpu_elr_el1(vcpu) = *vcpu_pc(vcpu);
-
 	*vcpu_pc(vcpu) = get_except_vector(vcpu, except_type_sync);
+
 	*vcpu_cpsr(vcpu) = PSTATE_FAULT_BITS_64;
+	*vcpu_spsr(vcpu) = cpsr;
 
 	/*
 	 * Build an unknown exception, depending on the instruction
arch/arm64/mm/mmu.c +4 -4
index 0f85a46c3e18..3e90a2cad995 100644
@@ -748,9 +748,9 @@ void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot)
 	/*
 	 * Check whether the physical FDT address is set and meets the minimum
 	 * alignment requirement. Since we are relying on MIN_FDT_ALIGN to be
-	 * at least 8 bytes so that we can always access the size field of the
-	 * FDT header after mapping the first chunk, double check here if that
-	 * is indeed the case.
+	 * at least 8 bytes so that we can always access the magic and size
+	 * fields of the FDT header after mapping the first chunk, double check
+	 * here if that is indeed the case.
 	 */
 	BUILD_BUG_ON(MIN_FDT_ALIGN < 8);
 	if (!dt_phys || dt_phys % MIN_FDT_ALIGN)
@@ -778,7 +778,7 @@ void *__init __fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot)
 	create_mapping_noalloc(round_down(dt_phys, SWAPPER_BLOCK_SIZE),
 			dt_virt_base, SWAPPER_BLOCK_SIZE, prot);
 
-	if (fdt_check_header(dt_virt) != 0)
+	if (fdt_magic(dt_virt) != FDT_MAGIC)
 		return NULL;
 
 	*size = fdt_totalsize(dt_virt);
arch/arm64/mm/proc.S +2 -0
index c4317879b938..5bb61de23201 100644
@@ -180,6 +180,8 @@ ENTRY(__cpu_setup)
 	msr	cpacr_el1, x0			// Enable FP/ASIMD
 	mov	x0, #1 << 12			// Reset mdscr_el1 and disable
 	msr	mdscr_el1, x0			// access to the DCC from EL0
+	isb					// Unmask debug exceptions now,
+	enable_dbg				// since this is per-cpu
 	reset_pmuserenr_el0 x0			// Disable PMU access from EL0
 	/*
 	 * Memory region attributes for LPAE:
arch/metag/include/asm/cmpxchg_lnkget.h +1 -1
index 0154e2807ebb..2369ad394876 100644
@@ -73,7 +73,7 @@ static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
 		      "	DCACHE	[%2], %0\n"
 #endif
 		      "2:\n"
-		      : "=&d" (temp), "=&da" (retval)
+		      : "=&d" (temp), "=&d" (retval)
 		      : "da" (m), "bd" (old), "da" (new)
 		      : "cc"
 		      );
arch/mips/kernel/cevt-r4k.c +1 -6
index e4c21bbf9422..804d2a2a19fe 100644
@@ -276,12 +276,7 @@ int r4k_clockevent_init(void)
 				  CLOCK_EVT_FEAT_C3STOP |
 				  CLOCK_EVT_FEAT_PERCPU;
 
-	clockevent_set_clock(cd, mips_hpt_frequency);
-
-	/* Calculate the min / max delta */
-	cd->max_delta_ns	= clockevent_delta2ns(0x7fffffff, cd);
 	min_delta		= calculate_min_delta();
-	cd->min_delta_ns	= clockevent_delta2ns(min_delta, cd);
 
 	cd->rating		= 300;
 	cd->irq			= irq;
@@ -289,7 +284,7 @@ int r4k_clockevent_init(void)
 	cd->set_next_event	= mips_next_event;
 	cd->event_handler	= mips_event_handler;
 
-	clockevents_register_device(cd);
+	clockevents_config_and_register(cd, mips_hpt_frequency, min_delta, 0x7fffffff);
 
 	if (cp0_timer_irq_installed)
 		return 0;
arch/mips/kernel/csrc-r4k.c +3 -1
index 1f910563fdf6..d76275da54cb 100644
@@ -23,7 +23,7 @@ static struct clocksource clocksource_mips = {
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-static u64 notrace r4k_read_sched_clock(void)
+static u64 __maybe_unused notrace r4k_read_sched_clock(void)
 {
 	return read_c0_count();
 }
@@ -82,7 +82,9 @@ int __init init_r4k_clocksource(void)
 
 	clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
 
+#ifndef CONFIG_CPU_FREQ
 	sched_clock_register(r4k_read_sched_clock, 32, mips_hpt_frequency);
+#endif
 
 	return 0;
 }
arch/mips/kvm/emulate.c +28 -12
index 645c8a1982a7..2b42a74ed771 100644
@@ -1615,8 +1615,14 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
 
 	preempt_disable();
 	if (KVM_GUEST_KSEGX(va) == KVM_GUEST_KSEG0) {
-		if (kvm_mips_host_tlb_lookup(vcpu, va) < 0)
-			kvm_mips_handle_kseg0_tlb_fault(va, vcpu);
+		if (kvm_mips_host_tlb_lookup(vcpu, va) < 0 &&
+		    kvm_mips_handle_kseg0_tlb_fault(va, vcpu)) {
+			kvm_err("%s: handling mapped kseg0 tlb fault for %lx, vcpu: %p, ASID: %#lx\n",
+				__func__, va, vcpu, read_c0_entryhi());
+			er = EMULATE_FAIL;
+			preempt_enable();
+			goto done;
+		}
 	} else if ((KVM_GUEST_KSEGX(va) < KVM_GUEST_KSEG0) ||
 		   KVM_GUEST_KSEGX(va) == KVM_GUEST_KSEG23) {
 		int index;
@@ -1654,14 +1660,19 @@ enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
 								run, vcpu);
 				preempt_enable();
 				goto dont_update_pc;
-			} else {
-				/*
-				 * We fault an entry from the guest tlb to the
-				 * shadow host TLB
-				 */
-				kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb,
-								     NULL,
-								     NULL);
+			}
+			/*
+			 * We fault an entry from the guest tlb to the
+			 * shadow host TLB
+			 */
+			if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb,
+								 NULL, NULL)) {
+				kvm_err("%s: handling mapped seg tlb fault for %lx, index: %u, vcpu: %p, ASID: %#lx\n",
+					__func__, va, index, vcpu,
+					read_c0_entryhi());
+				er = EMULATE_FAIL;
+				preempt_enable();
+				goto done;
 			}
 		}
 	} else {
@@ -2625,8 +2636,13 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause,
 			 * OK we have a Guest TLB entry, now inject it into the
 			 * shadow host TLB
 			 */
-			kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb, NULL,
-							     NULL);
+			if (kvm_mips_handle_mapped_seg_tlb_fault(vcpu, tlb,
+								 NULL, NULL)) {
+				kvm_err("%s: handling mapped seg tlb fault for %lx, index: %u, vcpu: %p, ASID: %#lx\n",
+					__func__, va, index, vcpu,
+					read_c0_entryhi());
+				er = EMULATE_FAIL;
+			}
 		}
 	}
 
arch/mips/kvm/tlb.c +43 -23

95 lines not on this page · raw message

arch/mips/loongson64/loongson-3/hpet.c +7 -7
index 249039af66c4..4788bea62a6a 100644
@@ -13,8 +13,8 @@
 #define SMBUS_PCI_REG64		0x64
 #define SMBUS_PCI_REGB4		0xb4
 
-#define HPET_MIN_CYCLES		64
-#define HPET_MIN_PROG_DELTA	(HPET_MIN_CYCLES + (HPET_MIN_CYCLES >> 1))
+#define HPET_MIN_CYCLES		16
+#define HPET_MIN_PROG_DELTA	(HPET_MIN_CYCLES * 12)
 
 static DEFINE_SPINLOCK(hpet_lock);
 DEFINE_PER_CPU(struct clock_event_device, hpet_clockevent_device);
@@ -157,14 +157,14 @@ static int hpet_tick_resume(struct clock_event_device *evt)
 static int hpet_next_event(unsigned long delta,
 		struct clock_event_device *evt)
 {
-	unsigned int cnt;
-	int res;
+	u32 cnt;
+	s32 res;
 
 	cnt = hpet_read(HPET_COUNTER);
-	cnt += delta;
+	cnt += (u32) delta;
 	hpet_write(HPET_T0_CMP, cnt);
 
-	res = (int)(cnt - hpet_read(HPET_COUNTER));
+	res = (s32)(cnt - hpet_read(HPET_COUNTER));
 
 	return res < HPET_MIN_CYCLES ? -ETIME : 0;
 }
@@ -230,7 +230,7 @@ void __init setup_hpet_timer(void)
 
 	cd = &per_cpu(hpet_clockevent_device, cpu);
 	cd->name = "hpet";
-	cd->rating = 320;
+	cd->rating = 100;
 	cd->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
 	cd->set_state_shutdown = hpet_set_state_shutdown;
 	cd->set_state_periodic = hpet_set_state_periodic;
arch/mips/mm/uasm-mips.c +1 -1
index 9c2220a45189..45e3b8799ed0 100644
@@ -65,7 +65,7 @@ static struct insn insn_table[] = {
 #ifndef CONFIG_CPU_MIPSR6
 	{ insn_cache,  M(cache_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
 #else
-	{ insn_cache,  M6(cache_op, 0, 0, 0, cache6_op),  RS | RT | SIMM9 },
+	{ insn_cache,  M6(spec3_op, 0, 0, 0, cache6_op),  RS | RT | SIMM9 },
 #endif
 	{ insn_daddiu, M(daddiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
 	{ insn_daddu, M(spec_op, 0, 0, 0, 0, daddu_op), RS | RT | RD },
arch/powerpc/kernel/tm.S +1 -2
index b7019b559ddb..298afcf3bf2a 100644
@@ -338,8 +338,6 @@ _GLOBAL(__tm_recheckpoint)
 	 */
 	subi	r7, r7, STACK_FRAME_OVERHEAD
 
-	SET_SCRATCH0(r1)
-
 	mfmsr	r6
 	/* R4 = original MSR to indicate whether thread used FP/Vector etc. */
 
@@ -468,6 +466,7 @@ restore_gprs:
 	 * until we turn MSR RI back on.
 	 */
 
+	SET_SCRATCH0(r1)
 	ld	r5, -8(r1)
 	ld	r1, -16(r1)
 
arch/powerpc/kvm/book3s_hv_rmhandlers.S +250 -212

498 lines not on this page · raw message

arch/s390/include/asm/pgtable.h +1 -1
index 18d2beb89340..42b968a85863 100644
@@ -893,7 +893,7 @@ void ptep_zap_key(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
 bool test_and_clear_guest_dirty(struct mm_struct *mm, unsigned long address);
 int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,
 			  unsigned char key, bool nq);
-unsigned char get_guest_storage_key(struct mm_struct *mm, unsigned long addr);
+unsigned long get_guest_storage_key(struct mm_struct *mm, unsigned long addr);
 
 /*
  * Certain architectures need to do special things when PTEs
arch/s390/include/asm/tlbflush.h +2 -1
index a2e6ef32e054..0a2031618f7f 100644
@@ -81,7 +81,8 @@ static inline void __tlb_flush_full(struct mm_struct *mm)
 }
 
 /*
- * Flush TLB entries for a specific ASCE on all CPUs.
+ * Flush TLB entries for a specific ASCE on all CPUs. Should never be used
+ * when more than one asce (e.g. gmap) ran on this mm.
  */
 static inline void __tlb_flush_asce(struct mm_struct *mm, unsigned long asce)
 {
arch/s390/mm/gmap.c +2 -2
index cace818d86eb..313c3b8cf7dd 100644
@@ -85,7 +85,7 @@ EXPORT_SYMBOL_GPL(gmap_alloc);
 static void gmap_flush_tlb(struct gmap *gmap)
 {
 	if (MACHINE_HAS_IDTE)
-		__tlb_flush_asce(gmap->mm, gmap->asce);
+		__tlb_flush_idte(gmap->asce);
 	else
 		__tlb_flush_global();
 }
@@ -124,7 +124,7 @@ void gmap_free(struct gmap *gmap)
 
 	/* Flush tlb. */
 	if (MACHINE_HAS_IDTE)
-		__tlb_flush_asce(gmap->mm, gmap->asce);
+		__tlb_flush_idte(gmap->asce);
 	else
 		__tlb_flush_global();
 
arch/s390/mm/pgtable.c +1 -1
index 9f0ce0e6eeb4..ebb4f87112f4 100644
@@ -543,7 +543,7 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,
 }
 EXPORT_SYMBOL(set_guest_storage_key);
 
-unsigned char get_guest_storage_key(struct mm_struct *mm, unsigned long addr)
+unsigned long get_guest_storage_key(struct mm_struct *mm, unsigned long addr)
 {
 	unsigned char key;
 	spinlock_t *ptl;
arch/um/os-Linux/signal.c +3 -2
index 8acaf4e384c0..a86d7cc2c2d8 100644
@@ -15,6 +15,7 @@
 #include <kern_util.h>
 #include <os.h>
 #include <sysdep/mcontext.h>
+#include <um_malloc.h>
 
 void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
 	[SIGTRAP]	= relay_signal,
@@ -32,7 +33,7 @@ static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)
 	struct uml_pt_regs *r;
 	int save_errno = errno;
 
-	r = malloc(sizeof(struct uml_pt_regs));
+	r = uml_kmalloc(sizeof(struct uml_pt_regs), UM_GFP_ATOMIC);
 	if (!r)
 		panic("out of memory");
 
@@ -91,7 +92,7 @@ static void timer_real_alarm_handler(mcontext_t *mc)
 {
 	struct uml_pt_regs *regs;
 
-	regs = malloc(sizeof(struct uml_pt_regs));
+	regs = uml_kmalloc(sizeof(struct uml_pt_regs), UM_GFP_ATOMIC);
 	if (!regs)
 		panic("out of memory");
 
arch/unicore32/include/asm/mmu_context.h +1 -1
index e35632ef23c7..62dfc644c908 100644
@@ -98,7 +98,7 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
 }
 
 static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
-		bool write, bool foreign)
+		bool write, bool execute, bool foreign)
 {
 	/* by default, allow everything */
 	return true;
arch/x86/events/intel/uncore_snbep.c +5 -5
index 874e8bd64d1d..bd136ac140be 100644
@@ -2546,7 +2546,7 @@ void hswep_uncore_cpu_init(void)
 
 static struct intel_uncore_type hswep_uncore_ha = {
 	.name		= "ha",
-	.num_counters   = 5,
+	.num_counters   = 4,
 	.num_boxes	= 2,
 	.perf_ctr_bits	= 48,
 	SNBEP_UNCORE_PCI_COMMON_INIT(),
@@ -2565,7 +2565,7 @@ static struct uncore_event_desc hswep_uncore_imc_events[] = {
 
 static struct intel_uncore_type hswep_uncore_imc = {
 	.name		= "imc",
-	.num_counters   = 5,
+	.num_counters   = 4,
 	.num_boxes	= 8,
 	.perf_ctr_bits	= 48,
 	.fixed_ctr_bits	= 48,
@@ -2611,7 +2611,7 @@ static struct intel_uncore_type hswep_uncore_irp = {
 
 static struct intel_uncore_type hswep_uncore_qpi = {
 	.name			= "qpi",
-	.num_counters		= 5,
+	.num_counters		= 4,
 	.num_boxes		= 3,
 	.perf_ctr_bits		= 48,
 	.perf_ctr		= SNBEP_PCI_PMON_CTR0,
@@ -2693,7 +2693,7 @@ static struct event_constraint hswep_uncore_r3qpi_constraints[] = {
 
 static struct intel_uncore_type hswep_uncore_r3qpi = {
 	.name		= "r3qpi",
-	.num_counters   = 4,
+	.num_counters   = 3,
 	.num_boxes	= 3,
 	.perf_ctr_bits	= 44,
 	.constraints	= hswep_uncore_r3qpi_constraints,
@@ -2892,7 +2892,7 @@ static struct intel_uncore_type bdx_uncore_ha = {
 
 static struct intel_uncore_type bdx_uncore_imc = {
 	.name		= "imc",
-	.num_counters   = 5,
+	.num_counters   = 4,
 	.num_boxes	= 8,
 	.perf_ctr_bits	= 48,
 	.fixed_ctr_bits	= 48,
arch/x86/kvm/mtrr.c +1 -0
index c146f3c262c3..0149ac59c273 100644
@@ -539,6 +539,7 @@ static void mtrr_lookup_var_start(struct mtrr_iter *iter)
 
 	iter->fixed = false;
 	iter->start_max = iter->start;
+	iter->range = NULL;
 	iter->range = list_prepare_entry(iter->range, &mtrr_state->head, node);
 
 	__mtrr_lookup_var_next(iter);
arch/x86/kvm/vmx.c +18 -2
index 64a79f271276..8326d6891395 100644
@@ -8224,6 +8224,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
 	if ((vectoring_info & VECTORING_INFO_VALID_MASK) &&
 			(exit_reason != EXIT_REASON_EXCEPTION_NMI &&
 			exit_reason != EXIT_REASON_EPT_VIOLATION &&
+			exit_reason != EXIT_REASON_PML_FULL &&
 			exit_reason != EXIT_REASON_TASK_SWITCH)) {
 		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
 		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_DELIVERY_EV;
@@ -8854,6 +8855,22 @@ static void vmx_load_vmcs01(struct kvm_vcpu *vcpu)
 	put_cpu();
 }
 
+/*
+ * Ensure that the current vmcs of the logical processor is the
+ * vmcs01 of the vcpu before calling free_nested().
+ */
+static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu)
+{
+       struct vcpu_vmx *vmx = to_vmx(vcpu);
+       int r;
+
+       r = vcpu_load(vcpu);
+       BUG_ON(r);
+       vmx_load_vmcs01(vcpu);
+       free_nested(vmx);
+       vcpu_put(vcpu);
+}
+
 static void vmx_free_vcpu(struct kvm_vcpu *vcpu)
 {
 	struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -8862,8 +8879,7 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu)
 		vmx_destroy_pml_buffer(vmx);
 	free_vpid(vmx->vpid);
 	leave_guest_mode(vcpu);
-	vmx_load_vmcs01(vcpu);
-	free_nested(vmx);
+	vmx_free_vcpu_nested(vcpu);
 	free_loaded_vmcs(vmx->loaded_vmcs);
 	kfree(vmx->guest_msrs);
 	kvm_vcpu_uninit(vcpu);
arch/x86/kvm/x86.c +29 -16

101 lines not on this page · raw message

arch/x86/pci/intel_mid_pci.c +10 -2
index 8b93e634af84..ae97f24a4371 100644
@@ -37,6 +37,7 @@
 
 /* Quirks for the listed devices */
 #define PCI_DEVICE_ID_INTEL_MRFL_MMC	0x1190
+#define PCI_DEVICE_ID_INTEL_MRFL_HSU	0x1191
 
 /* Fixed BAR fields */
 #define PCIE_VNDR_CAP_ID_FIXED_BAR 0x00	/* Fixed BAR (TBD) */
@@ -225,13 +226,20 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
 		/* Special treatment for IRQ0 */
 		if (dev->irq == 0) {
 			/*
+			 * Skip HS UART common registers device since it has
+			 * IRQ0 assigned and not used by the kernel.
+			 */
+			if (dev->device == PCI_DEVICE_ID_INTEL_MRFL_HSU)
+				return -EBUSY;
+			/*
 			 * TNG has IRQ0 assigned to eMMC controller. But there
 			 * are also other devices with bogus PCI configuration
 			 * that have IRQ0 assigned. This check ensures that
-			 * eMMC gets it.
+			 * eMMC gets it. The rest of devices still could be
+			 * enabled without interrupt line being allocated.
 			 */
 			if (dev->device != PCI_DEVICE_ID_INTEL_MRFL_MMC)
-				return -EBUSY;
+				return 0;
 		}
 		break;
 	default:
block/bio.c +15 -0
index 0e4aa42bc30d..462386908835 100644
@@ -579,6 +579,8 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)
 	bio->bi_rw = bio_src->bi_rw;
 	bio->bi_iter = bio_src->bi_iter;
 	bio->bi_io_vec = bio_src->bi_io_vec;
+
+	bio_clone_blkcg_association(bio, bio_src);
 }
 EXPORT_SYMBOL(__bio_clone_fast);
 
@@ -684,6 +686,8 @@ integrity_clone:
 		}
 	}
 
+	bio_clone_blkcg_association(bio, bio_src);
+
 	return bio;
 }
 EXPORT_SYMBOL(bio_clone_bioset);
@@ -2005,6 +2009,17 @@ void bio_disassociate_task(struct bio *bio)
 	}
 }
 
+/**
+ * bio_clone_blkcg_association - clone blkcg association from src to dst bio
+ * @dst: destination bio
+ * @src: source bio
+ */
+void bio_clone_blkcg_association(struct bio *dst, struct bio *src)
+{
+	if (src->bi_css)
+		WARN_ON(bio_associate_blkcg(dst, src->bi_css));
+}
+
 #endif /* CONFIG_BLK_CGROUP */
 
 static void __init biovec_init_slabs(void)
block/genhd.c +1 -1
index 3eebd256b765..086f1a357734 100644
@@ -613,7 +613,7 @@ void add_disk(struct gendisk *disk)
 
 	/* Register BDI before referencing it from bdev */
 	bdi = &disk->queue->backing_dev_info;
-	bdi_register_dev(bdi, disk_devt(disk));
+	bdi_register_owner(bdi, disk_to_dev(disk));
 
 	blk_register_region(disk_devt(disk), disk->minors, NULL,
 			    exact_match, exact_lock, disk);
drivers/acpi/ec.c +37 -4

82 lines not on this page · raw message

drivers/bcma/host_pci.c +1 -0
index cae5385cf499..bd46569e0e52 100644
@@ -295,6 +295,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4360) },
 	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_DELL, 0x0016) },
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_BROADCOM, 0x4365, PCI_VENDOR_ID_FOXCONN, 0xe092) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a0) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },
drivers/block/floppy.c +9 -12
index 84708a5f8c52..a1dcf12d3dad 100644
@@ -3663,11 +3663,6 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
 
 	opened_bdev[drive] = bdev;
 
-	if (!(mode & (FMODE_READ|FMODE_WRITE))) {
-		res = -EINVAL;
-		goto out;
-	}
-
 	res = -ENXIO;
 
 	if (!floppy_track_buffer) {
@@ -3711,13 +3706,15 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
 	if (UFDCS->rawcmd == 1)
 		UFDCS->rawcmd = 2;
 
-	UDRS->last_checked = 0;
-	clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
-	check_disk_change(bdev);
-	if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))
-		goto out;
-	if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))
-		goto out;
+	if (mode & (FMODE_READ|FMODE_WRITE)) {
+		UDRS->last_checked = 0;
+		clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
+		check_disk_change(bdev);
+		if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))
+			goto out;
+		if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))
+			goto out;
+	}
 
 	res = -EROFS;
 
drivers/bluetooth/ath3k.c +2 -0
index 25894687c168..fadba88745dc 100644
@@ -123,6 +123,7 @@ static const struct usb_device_id ath3k_table[] = {
 	{ USB_DEVICE(0x13d3, 0x3472) },
 	{ USB_DEVICE(0x13d3, 0x3474) },
 	{ USB_DEVICE(0x13d3, 0x3487) },
+	{ USB_DEVICE(0x13d3, 0x3490) },
 
 	/* Atheros AR5BBU12 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -190,6 +191,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = {
 	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3487), .driver_info = BTUSB_ATH3012 },
+	{ USB_DEVICE(0x13d3, 0x3490), .driver_info = BTUSB_ATH3012 },
 
 	/* Atheros AR5BBU22 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +1 -0
index a3be65e6231a..9f40c3426f0c 100644
@@ -237,6 +237,7 @@ static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },
 	{ USB_DEVICE(0x13d3, 0x3487), .driver_info = BTUSB_ATH3012 },
+	{ USB_DEVICE(0x13d3, 0x3490), .driver_info = BTUSB_ATH3012 },
 
 	/* Atheros AR5BBU12 with sflash firmware */
 	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
drivers/char/random.c +23 -10
index 87ab9f6b4112..d72c6d14a1c9 100644
@@ -949,6 +949,7 @@ void add_interrupt_randomness(int irq, int irq_flags)
 	/* award one bit for the contents of the fast pool */
 	credit_entropy_bits(r, credit + 1);
 }
+EXPORT_SYMBOL_GPL(add_interrupt_randomness);
 
 #ifdef CONFIG_BLOCK
 void add_disk_randomness(struct gendisk *disk)
@@ -1461,12 +1462,16 @@ random_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 static ssize_t
 urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
+	static int maxwarn = 10;
 	int ret;
 
-	if (unlikely(nonblocking_pool.initialized == 0))
-		printk_once(KERN_NOTICE "random: %s urandom read "
-			    "with %d bits of entropy available\n",
-			    current->comm, nonblocking_pool.entropy_total);
+	if (unlikely(nonblocking_pool.initialized == 0) &&
+	    maxwarn > 0) {
+		maxwarn--;
+		printk(KERN_NOTICE "random: %s: uninitialized urandom read "
+		       "(%zd bytes read, %d bits of entropy available)\n",
+		       current->comm, nbytes, nonblocking_pool.entropy_total);
+	}
 
 	nbytes = min_t(size_t, nbytes, INT_MAX >> (ENTROPY_SHIFT + 3));
 	ret = extract_entropy_user(&nonblocking_pool, buf, nbytes);
@@ -1774,13 +1779,15 @@ int random_int_secret_init(void)
 	return 0;
 }
 
+static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash)
+		__aligned(sizeof(unsigned long));
+
 /*
  * Get a random word for internal kernel use only. Similar to urandom but
  * with the goal of minimal entropy pool depletion. As a result, the random
  * value is not cryptographically secure but for several uses the cost of
  * depleting entropy is too high
  */
-static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);
 unsigned int get_random_int(void)
 {
 	__u32 *hash;
@@ -1850,12 +1857,18 @@ void add_hwgenerator_randomness(const char *buffer, size_t count,
 {
 	struct entropy_store *poolp = &input_pool;
 
-	/* Suspend writing if we're above the trickle threshold.
-	 * We'll be woken up again once below random_write_wakeup_thresh,
-	 * or when the calling thread is about to terminate.
-	 */
-	wait_event_interruptible(random_write_wait, kthread_should_stop() ||
+	if (unlikely(nonblocking_pool.initialized == 0))
+		poolp = &nonblocking_pool;
+	else {
+		/* Suspend writing if we're above the trickle
+		 * threshold.  We'll be woken up again once below
+		 * random_write_wakeup_thresh, or when the calling
+		 * thread is about to terminate.
+		 */
+		wait_event_interruptible(random_write_wait,
+					 kthread_should_stop() ||
 			ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);
+	}
 	mix_pool_bytes(poolp, buffer, count);
 	credit_entropy_bits(poolp, entropy);
 }
drivers/char/tpm/tpm_crb.c +1 -1
index a12b31940344..e9fd1d83f9f1 100644
@@ -246,7 +246,7 @@ static void __iomem *crb_map_res(struct device *dev, struct crb_priv *priv,
 
 	/* Detect a 64 bit address on a 32 bit system */
 	if (start != new_res.start)
-		return ERR_PTR(-EINVAL);
+		return (void __iomem *) ERR_PTR(-EINVAL);
 
 	if (!resource_contains(&priv->res, &new_res))
 		return devm_ioremap_resource(dev, &new_res);
drivers/clk/rockchip/clk-rk3399.c +1 -1
index 8059a8d3ea36..31b77f71313f 100644
@@ -586,7 +586,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
 			RK3399_CLKGATE_CON(8), 15, GFLAGS),
 
 	COMPOSITE(SCLK_SPDIF_REC_DPTX, "clk_spdif_rec_dptx", mux_pll_src_cpll_gpll_p, 0,
-			RK3399_CLKSEL_CON(32), 15, 1, MFLAGS, 0, 5, DFLAGS,
+			RK3399_CLKSEL_CON(32), 15, 1, MFLAGS, 8, 5, DFLAGS,
 			RK3399_CLKGATE_CON(10), 6, GFLAGS),
 	/* i2s */
 	COMPOSITE(0, "clk_i2s0_div", mux_pll_src_cpll_gpll_p, 0,
drivers/cpufreq/intel_pstate.c +1 -1
index 1fa1a32928d7..1b159171f1f9 100644
@@ -944,7 +944,7 @@ static int core_get_max_pstate(void)
 			if (err)
 				goto skip_tar;
 
-			tdp_msr = MSR_CONFIG_TDP_NOMINAL + tdp_ctrl;
+			tdp_msr = MSR_CONFIG_TDP_NOMINAL + (tdp_ctrl & 0x3);
 			err = rdmsrl_safe(tdp_msr, &tdp_ratio);
 			if (err)
 				goto skip_tar;
drivers/edac/edac_mc_sysfs.c +19 -1
index 10c305b4a2e1..4e0f8e720ad9 100644
@@ -313,7 +313,6 @@ static struct device_type csrow_attr_type = {
  * possible dynamic channel DIMM Label attribute files
  *
  */
-
 DEVICE_CHANNEL(ch0_dimm_label, S_IRUGO | S_IWUSR,
 	channel_dimm_label_show, channel_dimm_label_store, 0);
 DEVICE_CHANNEL(ch1_dimm_label, S_IRUGO | S_IWUSR,
@@ -326,6 +325,10 @@ DEVICE_CHANNEL(ch4_dimm_label, S_IRUGO | S_IWUSR,
 	channel_dimm_label_show, channel_dimm_label_store, 4);
 DEVICE_CHANNEL(ch5_dimm_label, S_IRUGO | S_IWUSR,
 	channel_dimm_label_show, channel_dimm_label_store, 5);
+DEVICE_CHANNEL(ch6_dimm_label, S_IRUGO | S_IWUSR,
+	channel_dimm_label_show, channel_dimm_label_store, 6);
+DEVICE_CHANNEL(ch7_dimm_label, S_IRUGO | S_IWUSR,
+	channel_dimm_label_show, channel_dimm_label_store, 7);
 
 /* Total possible dynamic DIMM Label attribute file table */
 static struct attribute *dynamic_csrow_dimm_attr[] = {
@@ -335,6 +338,8 @@ static struct attribute *dynamic_csrow_dimm_attr[] = {
 	&dev_attr_legacy_ch3_dimm_label.attr.attr,
 	&dev_attr_legacy_ch4_dimm_label.attr.attr,
 	&dev_attr_legacy_ch5_dimm_label.attr.attr,
+	&dev_attr_legacy_ch6_dimm_label.attr.attr,
+	&dev_attr_legacy_ch7_dimm_label.attr.attr,
 	NULL
 };
 
@@ -351,6 +356,10 @@ DEVICE_CHANNEL(ch4_ce_count, S_IRUGO,
 		   channel_ce_count_show, NULL, 4);
 DEVICE_CHANNEL(ch5_ce_count, S_IRUGO,
 		   channel_ce_count_show, NULL, 5);
+DEVICE_CHANNEL(ch6_ce_count, S_IRUGO,
+		   channel_ce_count_show, NULL, 6);
+DEVICE_CHANNEL(ch7_ce_count, S_IRUGO,
+		   channel_ce_count_show, NULL, 7);
 
 /* Total possible dynamic ce_count attribute file table */
 static struct attribute *dynamic_csrow_ce_count_attr[] = {
@@ -360,6 +369,8 @@ static struct attribute *dynamic_csrow_ce_count_attr[] = {
 	&dev_attr_legacy_ch3_ce_count.attr.attr,
 	&dev_attr_legacy_ch4_ce_count.attr.attr,
 	&dev_attr_legacy_ch5_ce_count.attr.attr,
+	&dev_attr_legacy_ch6_ce_count.attr.attr,
+	&dev_attr_legacy_ch7_ce_count.attr.attr,
 	NULL
 };
 
@@ -371,9 +382,16 @@ static umode_t csrow_dev_is_visible(struct kobject *kobj,
 
 	if (idx >= csrow->nr_channels)
 		return 0;
+
+	if (idx >= ARRAY_SIZE(dynamic_csrow_ce_count_attr) - 1) {
+		WARN_ONCE(1, "idx: %d\n", idx);
+		return 0;
+	}
+
 	/* Only expose populated DIMMs */
 	if (!csrow->channels[idx]->dimm->nr_pages)
 		return 0;
+
 	return attr->mode;
 }
 
drivers/gpio/gpio-intel-mid.c +1 -20
index cdaba13cb8e8..c0f7cce23f62 100644
@@ -17,7 +17,6 @@
  * Moorestown platform Langwell chip.
  * Medfield platform Penwell chip.
  * Clovertrail platform Cloverview chip.
- * Merrifield platform Tangier chip.
  */
 
 #include <linux/module.h>
@@ -64,10 +63,6 @@ enum GPIO_REG {
 /* intel_mid gpio driver data */
 struct intel_mid_gpio_ddata {
 	u16 ngpio;		/* number of gpio pins */
-	u32 gplr_offset;	/* offset of first GPLR register from base */
-	u32 flis_base;		/* base address of FLIS registers */
-	u32 flis_len;		/* length of FLIS registers */
-	u32 (*get_flis_offset)(int gpio);
 	u32 chip_irq_type;	/* chip interrupt type */
 };
 
@@ -252,15 +247,6 @@ static const struct intel_mid_gpio_ddata gpio_cloverview_core = {
 	.chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE,
 };
 
-static const struct intel_mid_gpio_ddata gpio_tangier = {
-	.ngpio = 192,
-	.gplr_offset = 4,
-	.flis_base = 0xff0c0000,
-	.flis_len = 0x8000,
-	.get_flis_offset = NULL,
-	.chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE,
-};
-
 static const struct pci_device_id intel_gpio_ids[] = {
 	{
 		/* Lincroft */
@@ -287,11 +273,6 @@ static const struct pci_device_id intel_gpio_ids[] = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x08f7),
 		.driver_data = (kernel_ulong_t)&gpio_cloverview_core,
 	},
-	{
-		/* Tangier */
-		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x1199),
-		.driver_data = (kernel_ulong_t)&gpio_tangier,
-	},
 	{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, intel_gpio_ids);
@@ -401,7 +382,7 @@ static int intel_gpio_probe(struct pci_dev *pdev,
 	spin_lock_init(&priv->lock);
 
 	pci_set_drvdata(pdev, priv);
-	retval = gpiochip_add_data(&priv->chip, priv);
+	retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv);
 	if (retval) {
 		dev_err(&pdev->dev, "gpiochip_add error %d\n", retval);
 		return retval;
drivers/gpio/gpio-pca953x.c +1 -1
index 5e3be32ebb8d..3745de659594 100644
@@ -90,7 +90,7 @@ MODULE_DEVICE_TABLE(acpi, pca953x_acpi_ids);
 #define MAX_BANK 5
 #define BANK_SZ 8
 
-#define NBANK(chip) (chip->gpio_chip.ngpio / BANK_SZ)
+#define NBANK(chip) DIV_ROUND_UP(chip->gpio_chip.ngpio, BANK_SZ)
 
 struct pca953x_chip {
 	unsigned gpio_start;
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +8 -17
index 9df1bcb35bf0..983175363b06 100644
@@ -551,28 +551,19 @@ int amdgpu_atombios_get_clock_info(struct amdgpu_device *adev)
 		    le16_to_cpu(firmware_info->info.usReferenceClock);
 		ppll->reference_div = 0;
 
-		if (crev < 2)
-			ppll->pll_out_min =
-				le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Output);
-		else
-			ppll->pll_out_min =
-				le32_to_cpu(firmware_info->info_12.ulMinPixelClockPLL_Output);
+		ppll->pll_out_min =
+			le32_to_cpu(firmware_info->info_12.ulMinPixelClockPLL_Output);
 		ppll->pll_out_max =
 		    le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output);
 
-		if (crev >= 4) {
-			ppll->lcd_pll_out_min =
-				le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100;
-			if (ppll->lcd_pll_out_min == 0)
-				ppll->lcd_pll_out_min = ppll->pll_out_min;
-			ppll->lcd_pll_out_max =
-				le16_to_cpu(firmware_info->info_14.usLcdMaxPixelClockPLL_Output) * 100;
-			if (ppll->lcd_pll_out_max == 0)
-				ppll->lcd_pll_out_max = ppll->pll_out_max;
-		} else {
+		ppll->lcd_pll_out_min =
+			le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100;
+		if (ppll->lcd_pll_out_min == 0)
 			ppll->lcd_pll_out_min = ppll->pll_out_min;
+		ppll->lcd_pll_out_max =
+			le16_to_cpu(firmware_info->info_14.usLcdMaxPixelClockPLL_Output) * 100;
+		if (ppll->lcd_pll_out_max == 0)
 			ppll->lcd_pll_out_max = ppll->pll_out_max;
-		}
 
 		if (ppll->pll_out_min == 0)
 			ppll->pll_out_min = 64800;
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +5 -0
index 35a1248aaa77..1b4c069f7765 100644
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/acpi.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 
 #include "amd_acpi.h"
 
@@ -259,6 +260,10 @@ static int amdgpu_atpx_set_discrete_state(struct amdgpu_atpx *atpx, u8 state)
 		if (!info)
 			return -EIO;
 		kfree(info);
+
+		/* 200ms delay is required after off */
+		if (state == 0)
+			msleep(200);
 	}
 	return 0;
 }
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +4 -3
index cb07da41152b..ff0b55a65ca3 100644
@@ -1690,7 +1690,6 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 						   DRM_MODE_SCALE_NONE);
 			/* no HPD on analog connectors */
 			amdgpu_connector->hpd.hpd = AMDGPU_HPD_NONE;
-			connector->polled = DRM_CONNECTOR_POLL_CONNECT;
 			connector->interlace_allowed = true;
 			connector->doublescan_allowed = true;
 			break;
@@ -1893,8 +1892,10 @@ amdgpu_connector_add(struct amdgpu_device *adev,
 	}
 
 	if (amdgpu_connector->hpd.hpd == AMDGPU_HPD_NONE) {
-		if (i2c_bus->valid)
-			connector->polled = DRM_CONNECTOR_POLL_CONNECT;
+		if (i2c_bus->valid) {
+			connector->polled = DRM_CONNECTOR_POLL_CONNECT |
+			                    DRM_CONNECTOR_POLL_DISCONNECT;
+		}
 	} else
 		connector->polled = DRM_CONNECTOR_POLL_HPD;
 
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +16 -0
index 6e920086af46..b7f5650d8218 100644
@@ -1841,7 +1841,23 @@ int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
 	}
 
 	drm_kms_helper_poll_enable(dev);
+
+	/*
+	 * Most of the connector probing functions try to acquire runtime pm
+	 * refs to ensure that the GPU is powered on when connector polling is
+	 * performed. Since we're calling this from a runtime PM callback,
+	 * trying to acquire rpm refs will cause us to deadlock.
+	 *
+	 * Since we're guaranteed to be holding the rpm lock, it's safe to
+	 * temporarily disable the rpm helpers so this doesn't deadlock us.
+	 */
+#ifdef CONFIG_PM
+	dev->dev->power.disable_depth++;
+#endif
 	drm_helper_hpd_irq_event(dev);
+#ifdef CONFIG_PM
+	dev->dev->power.disable_depth--;
+#endif
 
 	if (fbcon) {
 		amdgpu_fbdev_set_suspend(adev, 0);
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +1 -0
index 48b6bd671cda..c32eca26155c 100644
@@ -98,6 +98,7 @@ amdgpu_atombios_encoder_set_backlight_level(struct amdgpu_encoder *amdgpu_encode
 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
 			if (dig->backlight_level == 0)
 				amdgpu_atombios_encoder_setup_dig_transmitter(encoder,
 								       ATOM_TRANSMITTER_ACTION_LCD_BLOFF, 0, 0);
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -0
index 1feb6439cb0b..92695481093e 100644
@@ -167,6 +167,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
 		break;
 	case CHIP_KAVERI:
 	case CHIP_KABINI:
+	case CHIP_MULLINS:
 		return 0;
 	default: BUG();
 	}
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c +2 -2
index 90b35c5c10a4..ffc7c0dd3f14 100644
@@ -592,12 +592,12 @@ bool atomctrl_get_pp_assign_pin(
 		const uint32_t pinId,
 		pp_atomctrl_gpio_pin_assignment *gpio_pin_assignment)
 {
-	bool bRet = 0;
+	bool bRet = false;
 	ATOM_GPIO_PIN_LUT *gpio_lookup_table =
 		get_gpio_lookup_table(hwmgr->device);
 
 	PP_ASSERT_WITH_CODE((NULL != gpio_lookup_table),
-			"Could not find GPIO lookup Table in BIOS.", return -1);
+			"Could not find GPIO lookup Table in BIOS.", return false);
 
 	bRet = atomctrl_lookup_gpio_pin(gpio_lookup_table, pinId,
 		gpio_pin_assignment);
drivers/gpu/drm/drm_cache.c +1 -0
index 059f7c39c582..a7916e5f8864 100644
@@ -136,6 +136,7 @@ drm_clflush_virt_range(void *addr, unsigned long length)
 		mb();
 		for (; addr < end; addr += size)
 			clflushopt(addr);
+		clflushopt(end - 1); /* force serialisation */
 		mb();
 		return;
 	}
drivers/gpu/drm/drm_dp_helper.c +1 -1
index eeaf5a7c3aa7..67b28f8018d2 100644
@@ -203,7 +203,7 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request,
 
 		ret = aux->transfer(aux, &msg);
 
-		if (ret > 0) {
+		if (ret >= 0) {
 			native_reply = msg.reply & DP_AUX_NATIVE_REPLY_MASK;
 			if (native_reply == DP_AUX_NATIVE_REPLY_ACK) {
 				if (ret == size)
drivers/gpu/drm/drm_edid.c +8 -0
index 7df26d4b7ad8..2cb472b9976a 100644
@@ -74,6 +74,8 @@
 #define EDID_QUIRK_FORCE_8BPC			(1 << 8)
 /* Force 12bpc */
 #define EDID_QUIRK_FORCE_12BPC			(1 << 9)
+/* Force 6bpc */
+#define EDID_QUIRK_FORCE_6BPC			(1 << 10)
 
 struct detailed_mode_closure {
 	struct drm_connector *connector;
@@ -100,6 +102,9 @@ static struct edid_quirk {
 	/* Unknown Acer */
 	{ "ACR", 2423, EDID_QUIRK_FIRST_DETAILED_PREFERRED },
 
+	/* AEO model 0 reports 8 bpc, but is a 6 bpc panel */
+	{ "AEO", 0, EDID_QUIRK_FORCE_6BPC },
+
 	/* Belinea 10 15 55 */
 	{ "MAX", 1516, EDID_QUIRK_PREFER_LARGE_60 },
 	{ "MAX", 0x77e, EDID_QUIRK_PREFER_LARGE_60 },
@@ -4082,6 +4087,9 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
 
 	drm_add_display_info(edid, &connector->display_info, connector);
 
+	if (quirks & EDID_QUIRK_FORCE_6BPC)
+		connector->display_info.bpc = 6;
+
 	if (quirks & EDID_QUIRK_FORCE_8BPC)
 		connector->display_info.bpc = 8;
 
drivers/gpu/drm/i915/i915_drv.h +2 -0
index bc3f2e6842e7..227a63ee0067 100644
@@ -2591,6 +2591,8 @@ struct drm_i915_cmd_table {
 #define SKL_REVID_D0		0x3
 #define SKL_REVID_E0		0x4
 #define SKL_REVID_F0		0x5
+#define SKL_REVID_G0		0x6
+#define SKL_REVID_H0		0x7
 
 #define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))
 
drivers/gpu/drm/i915/i915_reg.h +5 -0
index 3fcf7dd5b6ca..bc3b6dde7b4b 100644
@@ -1672,6 +1672,9 @@ enum skl_disp_power_wells {
 
 #define GEN7_TLB_RD_ADDR	_MMIO(0x4700)
 
+#define GEN9_GAMT_ECO_REG_RW_IA _MMIO(0x4ab0)
+#define   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS	(1<<18)
+
 #define GAMT_CHKN_BIT_REG	_MMIO(0x4ab8)
 #define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING	(1<<28)
 
@@ -7538,6 +7541,8 @@ enum skl_disp_power_wells {
 
 #define CDCLK_FREQ			_MMIO(0x46200)
 
+#define CDCLK_FREQ			_MMIO(0x46200)
+
 #define _TRANSA_MSA_MISC		0x60410
 #define _TRANSB_MSA_MISC		0x61410
 #define _TRANSC_MSA_MISC		0x62410
drivers/gpu/drm/i915/intel_display.c +7 -15
index 3074c56a643d..32893195d7c4 100644
@@ -9700,6 +9700,8 @@ static void broadwell_set_cdclk(struct drm_device *dev, int cdclk)
 
 	I915_WRITE(CDCLK_FREQ, DIV_ROUND_CLOSEST(cdclk, 1000) - 1);
 
+	I915_WRITE(CDCLK_FREQ, DIV_ROUND_CLOSEST(cdclk, 1000) - 1);
+
 	intel_update_cdclk(dev);
 
 	WARN(cdclk != dev_priv->cdclk_freq,
@@ -12095,21 +12097,11 @@ connected_sink_compute_bpp(struct intel_connector *connector,
 		pipe_config->pipe_bpp = connector->base.display_info.bpc*3;
 	}
 
-	/* Clamp bpp to default limit on screens without EDID 1.4 */
-	if (connector->base.display_info.bpc == 0) {
-		int type = connector->base.connector_type;
-		int clamp_bpp = 24;
-
-		/* Fall back to 18 bpp when DP sink capability is unknown. */
-		if (type == DRM_MODE_CONNECTOR_DisplayPort ||
-		    type == DRM_MODE_CONNECTOR_eDP)
-			clamp_bpp = 18;
-
-		if (bpp > clamp_bpp) {
-			DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of %d\n",
-				      bpp, clamp_bpp);
-			pipe_config->pipe_bpp = clamp_bpp;
-		}
+	/* Clamp bpp to 8 on screens without EDID 1.4 */
+	if (connector->base.display_info.bpc == 0 && bpp > 24) {
+		DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n",
+			      bpp);
+		pipe_config->pipe_bpp = 24;
 	}
 }
 
drivers/gpu/drm/i915/intel_pm.c +2 -1
index 2863b92c9da6..c1ca5a7ba86f 100644
@@ -4563,7 +4563,8 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv)
 		else
 			gen6_set_rps(dev_priv->dev, dev_priv->rps.idle_freq);
 		dev_priv->rps.last_adj = 0;
-		I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);
+		I915_WRITE(GEN6_PMINTRMSK,
+			   gen6_sanitize_rps_pm_mask(dev_priv, ~0));
 	}
 	mutex_unlock(&dev_priv->rps.hw_lock);
 
drivers/gpu/drm/i915/intel_ringbuffer.c +14 -0
index 68c5af079ef8..9d778f3ab27d 100644
@@ -1135,6 +1135,11 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
 	/* WaDisableGafsUnitClkGating:skl */
 	WA_SET_BIT(GEN7_UCGCTL4, GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);
 
+	/* WaInPlaceDecompressionHang:skl */
+	if (IS_SKL_REVID(dev_priv, SKL_REVID_H0, REVID_FOREVER))
+		WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
+			   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
+
 	/* WaDisableLSQCROPERFforOCL:skl */
 	ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);
 	if (ret)
@@ -1194,6 +1199,11 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)
 		WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,
 				  GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);
 
+	/* WaInPlaceDecompressionHang:bxt */
+	if (IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER))
+		WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
+			   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
+
 	return 0;
 }
 
@@ -1241,6 +1251,10 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)
 		GEN7_HALF_SLICE_CHICKEN1,
 		GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);
 
+	/* WaInPlaceDecompressionHang:kbl */
+	WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,
+		   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);
+
 	/* WaDisableLSQCROPERFforOCL:kbl */
 	ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);
 	if (ret)
drivers/gpu/drm/nouveau/nouveau_drm.c +10 -1
index 11f8dd9c0edb..d6c134b01833 100644
@@ -324,7 +324,16 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
 	    !vga_switcheroo_handler_flags())
 		return -EPROBE_DEFER;
 
-	/* remove conflicting drivers (vesafb, efifb etc) */
+	/* We need to check that the chipset is supported before booting
+	 * fbdev off the hardware, as there's no way to put it back.
+	 */
+	ret = nvkm_device_pci_new(pdev, NULL, "error", true, false, 0, &device);
+	if (ret)
+		return ret;
+
+	nvkm_device_del(&device);
+
+	/* Remove conflicting drivers (vesafb, efifb etc). */
 	aper = alloc_apertures(3);
 	if (!aper)
 		return -ENOMEM;
drivers/gpu/drm/nouveau/nv04_fbcon.c +2 -2
index 7d9248b8c664..da8fd5ff9d0f 100644
@@ -107,11 +107,11 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
 			 ((image->dx + image->width) & 0xffff));
 	OUT_RING(chan, bg);
 	OUT_RING(chan, fg);
-	OUT_RING(chan, (image->height << 16) | image->width);
+	OUT_RING(chan, (image->height << 16) | ALIGN(image->width, 8));
 	OUT_RING(chan, (image->height << 16) | image->width);
 	OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff));
 
-	dsize = ALIGN(image->width * image->height, 32) >> 5;
+	dsize = ALIGN(ALIGN(image->width, 8) * image->height, 32) >> 5;
 	while (dsize) {
 		int iter_len = dsize > 128 ? 128 : dsize;
 
drivers/gpu/drm/nouveau/nv50_fbcon.c +1 -1
index 1aeb698e9707..af3d3c49411a 100644
@@ -125,7 +125,7 @@ nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
 	OUT_RING(chan, 0);
 	OUT_RING(chan, image->dy);
 
-	dwords = ALIGN(image->width * image->height, 32) >> 5;
+	dwords = ALIGN(ALIGN(image->width, 8) * image->height, 32) >> 5;
 	while (dwords) {
 		int push = dwords > 2047 ? 2047 : dwords;
 
drivers/gpu/drm/nouveau/nvc0_fbcon.c +1 -1
index 839f4c8c1805..054b6a056d99 100644
@@ -125,7 +125,7 @@ nvc0_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
 	OUT_RING  (chan, 0);
 	OUT_RING  (chan, image->dy);
 
-	dwords = ALIGN(image->width * image->height, 32) >> 5;
+	dwords = ALIGN(ALIGN(image->width, 8) * image->height, 32) >> 5;
 	while (dwords) {
 		int push = dwords > 2047 ? 2047 : dwords;
 
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c +2 -2
index 69de8c6259fe..f1e15a4d4f64 100644
@@ -76,8 +76,8 @@ nv30_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch,
 		nvkm_wo32(chan->inst, i, 0x00040004);
 	for (i = 0x1f18; i <= 0x3088 ; i += 16) {
 		nvkm_wo32(chan->inst, i + 0, 0x10700ff9);
-		nvkm_wo32(chan->inst, i + 1, 0x0436086c);
-		nvkm_wo32(chan->inst, i + 2, 0x000c001b);
+		nvkm_wo32(chan->inst, i + 4, 0x0436086c);
+		nvkm_wo32(chan->inst, i + 8, 0x000c001b);
 	}
 	for (i = 0x30b8; i < 0x30c8; i += 4)
 		nvkm_wo32(chan->inst, i, 0x0000ffff);
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c +2 -2
index 2207dac23981..300f5ed5de0b 100644
@@ -75,8 +75,8 @@ nv34_gr_chan_new(struct nvkm_gr *base, struct nvkm_fifo_chan *fifoch,
 		nvkm_wo32(chan->inst, i, 0x00040004);
 	for (i = 0x15ac; i <= 0x271c ; i += 16) {
 		nvkm_wo32(chan->inst, i + 0, 0x10700ff9);
-		nvkm_wo32(chan->inst, i + 1, 0x0436086c);
-		nvkm_wo32(chan->inst, i + 2, 0x000c001b);
+		nvkm_wo32(chan->inst, i + 4, 0x0436086c);
+		nvkm_wo32(chan->inst, i + 8, 0x000c001b);
 	}
 	for (i = 0x274c; i < 0x275c; i += 4)
 		nvkm_wo32(chan->inst, i, 0x0000ffff);
drivers/gpu/drm/radeon/atombios_encoders.c +1 -0
index 587cae4e73c9..56bb758f4e33 100644
@@ -120,6 +120,7 @@ atombios_set_backlight_level(struct radeon_encoder *radeon_encoder, u8 level)
 		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
 		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
 			if (dig->backlight_level == 0)
 				atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_LCD_BLOFF, 0, 0);
 			else {
drivers/gpu/drm/radeon/radeon_atombios.c +2 -2
index f8097a0e7a79..5df3ec73021b 100644
@@ -1155,7 +1155,7 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
 		    le16_to_cpu(firmware_info->info.usReferenceClock);
 		p1pll->reference_div = 0;
 
-		if (crev < 2)
+		if ((frev < 2) && (crev < 2))
 			p1pll->pll_out_min =
 				le16_to_cpu(firmware_info->info.usMinPixelClockPLL_Output);
 		else
@@ -1164,7 +1164,7 @@ bool radeon_atom_get_clock_info(struct drm_device *dev)
 		p1pll->pll_out_max =
 		    le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output);
 
-		if (crev >= 4) {
+		if (((frev < 2) && (crev >= 4)) || (frev >= 2)) {
 			p1pll->lcd_pll_out_min =
 				le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100;
 			if (p1pll->lcd_pll_out_min == 0)
drivers/gpu/drm/radeon/radeon_atpx_handler.c +5 -0
index 95f4fea89302..1b3f4e51f5dc 100644
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/acpi.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 
 #include "radeon_acpi.h"
 
@@ -258,6 +259,10 @@ static int radeon_atpx_set_discrete_state(struct radeon_atpx *atpx, u8 state)
 		if (!info)
 			return -EIO;
 		kfree(info);
+
+		/* 200ms delay is required after off */
+		if (state == 0)
+			msleep(200);
 	}
 	return 0;
 }
drivers/gpu/drm/radeon/radeon_connectors.c +9 -6
index 81a63d7f5cd9..b79f3b002471 100644
@@ -2064,7 +2064,6 @@ radeon_add_atom_connector(struct drm_device *dev,
 							   RADEON_OUTPUT_CSC_BYPASS);
 			/* no HPD on analog connectors */
 			radeon_connector->hpd.hpd = RADEON_HPD_NONE;
-			connector->polled = DRM_CONNECTOR_POLL_CONNECT;
 			connector->interlace_allowed = true;
 			connector->doublescan_allowed = true;
 			break;
@@ -2314,8 +2313,10 @@ radeon_add_atom_connector(struct drm_device *dev,
 	}
 
 	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
-		if (i2c_bus->valid)
-			connector->polled = DRM_CONNECTOR_POLL_CONNECT;
+		if (i2c_bus->valid) {
+			connector->polled = DRM_CONNECTOR_POLL_CONNECT |
+			                    DRM_CONNECTOR_POLL_DISCONNECT;
+		}
 	} else
 		connector->polled = DRM_CONNECTOR_POLL_HPD;
 
@@ -2391,7 +2392,6 @@ radeon_add_legacy_connector(struct drm_device *dev,
 					      1);
 		/* no HPD on analog connectors */
 		radeon_connector->hpd.hpd = RADEON_HPD_NONE;
-		connector->polled = DRM_CONNECTOR_POLL_CONNECT;
 		connector->interlace_allowed = true;
 		connector->doublescan_allowed = true;
 		break;
@@ -2476,10 +2476,13 @@ radeon_add_legacy_connector(struct drm_device *dev,
 	}
 
 	if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
-		if (i2c_bus->valid)
-			connector->polled = DRM_CONNECTOR_POLL_CONNECT;
+		if (i2c_bus->valid) {
+			connector->polled = DRM_CONNECTOR_POLL_CONNECT |
+			                    DRM_CONNECTOR_POLL_DISCONNECT;
+		}
 	} else
 		connector->polled = DRM_CONNECTOR_POLL_HPD;
+
 	connector->display_info.subpixel_order = subpixel_order;
 	drm_connector_register(connector);
 }
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +12 -1
index 1c4d5b5a70a2..b1673236c356 100644
@@ -1048,6 +1048,17 @@ static void vop_crtc_destroy(struct drm_crtc *crtc)
 	drm_crtc_cleanup(crtc);
 }
 
+static void vop_crtc_reset(struct drm_crtc *crtc)
+{
+	if (crtc->state)
+		__drm_atomic_helper_crtc_destroy_state(crtc->state);
+	kfree(crtc->state);
+
+	crtc->state = kzalloc(sizeof(struct rockchip_crtc_state), GFP_KERNEL);
+	if (crtc->state)
+		crtc->state->crtc = crtc;
+}
+
 static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc)
 {
 	struct rockchip_crtc_state *rockchip_state;
@@ -1073,7 +1084,7 @@ static const struct drm_crtc_funcs vop_crtc_funcs = {
 	.set_config = drm_atomic_helper_set_config,
 	.page_flip = drm_atomic_helper_page_flip,
 	.destroy = vop_crtc_destroy,
-	.reset = drm_atomic_helper_crtc_reset,
+	.reset = vop_crtc_reset,
 	.atomic_duplicate_state = vop_crtc_duplicate_state,
 	.atomic_destroy_state = vop_crtc_destroy_state,
 };
drivers/hid/uhid.c +24 -9
index 16b6f11a0700..99ec3ff7563b 100644
@@ -51,10 +51,26 @@ struct uhid_device {
 	u32 report_id;
 	u32 report_type;
 	struct uhid_event report_buf;
+	struct work_struct worker;
 };
 
 static struct miscdevice uhid_misc;
 
+static void uhid_device_add_worker(struct work_struct *work)
+{
+	struct uhid_device *uhid = container_of(work, struct uhid_device, worker);
+	int ret;
+
+	ret = hid_add_device(uhid->hid);
+	if (ret) {
+		hid_err(uhid->hid, "Cannot register HID device: error %d\n", ret);
+
+		hid_destroy_device(uhid->hid);
+		uhid->hid = NULL;
+		uhid->running = false;
+	}
+}
+
 static void uhid_queue(struct uhid_device *uhid, struct uhid_event *ev)
 {
 	__u8 newhead;
@@ -498,18 +514,14 @@ static int uhid_dev_create2(struct uhid_device *uhid,
 	uhid->hid = hid;
 	uhid->running = true;
 
-	ret = hid_add_device(hid);
-	if (ret) {
-		hid_err(hid, "Cannot register HID device\n");
-		goto err_hid;
-	}
+	/* Adding of a HID device is done through a worker, to allow HID drivers
+	 * which use feature requests during .probe to work, without they would
+	 * be blocked on devlock, which is held by uhid_char_write.
+	 */
+	schedule_work(&uhid->worker);
 
 	return 0;
 
-err_hid:
-	hid_destroy_device(hid);
-	uhid->hid = NULL;
-	uhid->running = false;
 err_free:
 	kfree(uhid->rd_data);
 	uhid->rd_data = NULL;
@@ -550,6 +562,8 @@ static int uhid_dev_destroy(struct uhid_device *uhid)
 	uhid->running = false;
 	wake_up_interruptible(&uhid->report_wait);
 
+	cancel_work_sync(&uhid->worker);
+
 	hid_destroy_device(uhid->hid);
 	kfree(uhid->rd_data);
 
@@ -612,6 +626,7 @@ static int uhid_char_open(struct inode *inode, struct file *file)
 	init_waitqueue_head(&uhid->waitq);
 	init_waitqueue_head(&uhid->report_wait);
 	uhid->running = false;
+	INIT_WORK(&uhid->worker, uhid_device_add_worker);
 
 	file->private_data = uhid;
 	nonseekable_open(inode, file);
drivers/hv/vmbus_drv.c +3 -0
index 952f20fdc7e3..e82f7e1c217c 100644
@@ -42,6 +42,7 @@
 #include <linux/screen_info.h>
 #include <linux/kdebug.h>
 #include <linux/efi.h>
+#include <linux/random.h>
 #include "hyperv_vmbus.h"
 
 static struct acpi_device  *hv_acpi_dev;
@@ -806,6 +807,8 @@ static void vmbus_isr(void)
 		else
 			tasklet_schedule(hv_context.msg_dpc[cpu]);
 	}
+
+	add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0);
 }
 
 
drivers/i2c/busses/i2c-efm32.c +1 -1
index 8eff62738877..e253598d764c 100644
@@ -433,7 +433,7 @@ static int efm32_i2c_probe(struct platform_device *pdev)
 	ret = request_irq(ddata->irq, efm32_i2c_irq, 0, DRIVER_NAME, ddata);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "failed to request irq (%d)\n", ret);
-		return ret;
+		goto err_disable_clk;
 	}
 
 	ret = i2c_add_adapter(&ddata->adapter);
drivers/infiniband/core/rw.c +11 -13
index 1eb9b1294a63..dbfd854c32c9 100644
@@ -58,19 +58,13 @@ static inline bool rdma_rw_io_needs_mr(struct ib_device *dev, u8 port_num,
 	return false;
 }
 
-static inline u32 rdma_rw_max_sge(struct ib_device *dev,
-		enum dma_data_direction dir)
-{
-	return dir == DMA_TO_DEVICE ?
-		dev->attrs.max_sge : dev->attrs.max_sge_rd;
-}
-
 static inline u32 rdma_rw_fr_page_list_len(struct ib_device *dev)
 {
 	/* arbitrary limit to avoid allocating gigantic resources */
 	return min_t(u32, dev->attrs.max_fast_reg_page_list_len, 256);
 }
 
+/* Caller must have zero-initialized *reg. */
 static int rdma_rw_init_one_mr(struct ib_qp *qp, u8 port_num,
 		struct rdma_rw_reg_ctx *reg, struct scatterlist *sg,
 		u32 sg_cnt, u32 offset)
@@ -114,6 +108,7 @@ static int rdma_rw_init_mr_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
 		u8 port_num, struct scatterlist *sg, u32 sg_cnt, u32 offset,
 		u64 remote_addr, u32 rkey, enum dma_data_direction dir)
 {
+	struct rdma_rw_reg_ctx *prev = NULL;
 	u32 pages_per_mr = rdma_rw_fr_page_list_len(qp->pd->device);
 	int i, j, ret = 0, count = 0;
 
@@ -125,7 +120,6 @@ static int rdma_rw_init_mr_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
 	}
 
 	for (i = 0; i < ctx->nr_ops; i++) {
-		struct rdma_rw_reg_ctx *prev = i ? &ctx->reg[i - 1] : NULL;
 		struct rdma_rw_reg_ctx *reg = &ctx->reg[i];
 		u32 nents = min(sg_cnt, pages_per_mr);
 
@@ -162,9 +156,13 @@ static int rdma_rw_init_mr_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
 		sg_cnt -= nents;
 		for (j = 0; j < nents; j++)
 			sg = sg_next(sg);
+		prev = reg;
 		offset = 0;
 	}
 
+	if (prev)
+		prev->wr.wr.next = NULL;
+
 	ctx->type = RDMA_RW_MR;
 	return count;
 
@@ -181,7 +179,8 @@ static int rdma_rw_init_map_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
 		u64 remote_addr, u32 rkey, enum dma_data_direction dir)
 {
 	struct ib_device *dev = qp->pd->device;
-	u32 max_sge = rdma_rw_max_sge(dev, dir);
+	u32 max_sge = dir == DMA_TO_DEVICE ? qp->max_write_sge :
+		      qp->max_read_sge;
 	struct ib_sge *sge;
 	u32 total_len = 0, i, j;
 
@@ -205,11 +204,10 @@ static int rdma_rw_init_map_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
 			rdma_wr->wr.opcode = IB_WR_RDMA_READ;
 		rdma_wr->remote_addr = remote_addr + total_len;
 		rdma_wr->rkey = rkey;
+		rdma_wr->wr.num_sge = nr_sge;
 		rdma_wr->wr.sg_list = sge;
 
 		for (j = 0; j < nr_sge; j++, sg = sg_next(sg)) {
-			rdma_wr->wr.num_sge++;
-
 			sge->addr = ib_sg_dma_address(dev, sg) + offset;
 			sge->length = ib_sg_dma_len(dev, sg) - offset;
 			sge->lkey = qp->pd->local_dma_lkey;
@@ -220,8 +218,8 @@ static int rdma_rw_init_map_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp,
 			offset = 0;
 		}
 
-		if (i + 1 < ctx->nr_ops)
-			rdma_wr->wr.next = &ctx->map.wrs[i + 1].wr;
+		rdma_wr->wr.next = i + 1 < ctx->nr_ops ?
+			&ctx->map.wrs[i + 1].wr : NULL;
 	}
 
 	ctx->type = RDMA_RW_MULTI_WR;
drivers/infiniband/core/verbs.c +9 -0
index 6298f54b4137..e39a0b597234 100644
@@ -814,6 +814,15 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd,
 		}
 	}
 
+	/*
+	 * Note: all hw drivers guarantee that max_send_sge is lower than
+	 * the device RDMA WRITE SGE limit but not all hw drivers ensure that
+	 * max_send_sge <= max_sge_rd.
+	 */
+	qp->max_write_sge = qp_init_attr->cap.max_send_sge;
+	qp->max_read_sge = min_t(u32, qp_init_attr->cap.max_send_sge,
+				 device->attrs.max_sge_rd);
+
 	return qp;
 }
 EXPORT_SYMBOL(ib_create_qp);
drivers/infiniband/hw/mlx5/gsi.c +6 -13
index 53e03c8ede79..79e6309460dc 100644
@@ -69,15 +69,6 @@ static bool mlx5_ib_deth_sqpn_cap(struct mlx5_ib_dev *dev)
 	return MLX5_CAP_GEN(dev->mdev, set_deth_sqpn);
 }
 
-static u32 next_outstanding(struct mlx5_ib_gsi_qp *gsi, u32 index)
-{
-	return ++index % gsi->cap.max_send_wr;
-}
-
-#define for_each_outstanding_wr(gsi, index) \
-	for (index = gsi->outstanding_ci; index != gsi->outstanding_pi; \
-	     index = next_outstanding(gsi, index))
-
 /* Call with gsi->lock locked */
 static void generate_completions(struct mlx5_ib_gsi_qp *gsi)
 {
@@ -85,8 +76,9 @@ static void generate_completions(struct mlx5_ib_gsi_qp *gsi)
 	struct mlx5_ib_gsi_wr *wr;
 	u32 index;
 
-	for_each_outstanding_wr(gsi, index) {
-		wr = &gsi->outstanding_wrs[index];
+	for (index = gsi->outstanding_ci; index != gsi->outstanding_pi;
+	     index++) {
+		wr = &gsi->outstanding_wrs[index % gsi->cap.max_send_wr];
 
 		if (!wr->completed)
 			break;
@@ -430,8 +422,9 @@ static int mlx5_ib_add_outstanding_wr(struct mlx5_ib_gsi_qp *gsi,
 		return -ENOMEM;
 	}
 
-	gsi_wr = &gsi->outstanding_wrs[gsi->outstanding_pi];
-	gsi->outstanding_pi = next_outstanding(gsi, gsi->outstanding_pi);
+	gsi_wr = &gsi->outstanding_wrs[gsi->outstanding_pi %
+				       gsi->cap.max_send_wr];
+	gsi->outstanding_pi++;
 
 	if (!wc) {
 		memset(&gsi_wr->wc, 0, sizeof(gsi_wr->wc));
drivers/infiniband/sw/rdmavt/Kconfig +0 -1
index 11aa6a34bd71..1da8d01a6855 100644
@@ -1,6 +1,5 @@
 config INFINIBAND_RDMAVT
 	tristate "RDMA verbs transport library"
 	depends on 64BIT
-	default m
 	---help---
 	This is a common software verbs provider for RDMA networks.
drivers/infiniband/sw/rdmavt/cq.c +1 -0
index 6ca6fa80dd6e..f2f229efbe64 100644
@@ -510,6 +510,7 @@ int rvt_driver_cq_init(struct rvt_dev_info *rdi)
 
 	if (rdi->worker)
 		return 0;
+	spin_lock_init(&rdi->n_cqs_lock);
 	rdi->worker = kzalloc(sizeof(*rdi->worker), GFP_KERNEL);
 	if (!rdi->worker)
 		return -ENOMEM;
drivers/infiniband/ulp/srpt/ib_srpt.c +2 -1
index 4a4155640d51..9a3b954e862d 100644
@@ -1601,6 +1601,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)
 	struct ib_qp_init_attr *qp_init;
 	struct srpt_port *sport = ch->sport;
 	struct srpt_device *sdev = sport->sdev;
+	const struct ib_device_attr *attrs = &sdev->device->attrs;
 	u32 srp_sq_size = sport->port_attrib.srp_sq_size;
 	int ret;
 
@@ -1638,7 +1639,7 @@ retry:
 	 */
 	qp_init->cap.max_send_wr = srp_sq_size / 2;
 	qp_init->cap.max_rdma_ctxs = srp_sq_size / 2;
-	qp_init->cap.max_send_sge = SRPT_DEF_SG_PER_WQE;
+	qp_init->cap.max_send_sge = min(attrs->max_sge, SRPT_MAX_SG_PER_WQE);
 	qp_init->port_num = ch->sport->port;
 
 	ch->qp = ib_create_qp(sdev->pd, qp_init);
drivers/infiniband/ulp/srpt/ib_srpt.h +5 -1
index 389030487da7..581878782854 100644
@@ -106,7 +106,11 @@ enum {
 	SRP_LOGIN_RSP_MULTICHAN_MAINTAINED = 0x2,
 
 	SRPT_DEF_SG_TABLESIZE = 128,
-	SRPT_DEF_SG_PER_WQE = 16,
+	/*
+	 * An experimentally determined value that avoids that QP creation
+	 * fails due to "swiotlb buffer is full" on systems using the swiotlb.
+	 */
+	SRPT_MAX_SG_PER_WQE = 16,
 
 	MIN_SRPT_SQ_SIZE = 16,
 	DEF_SRPT_SQ_SIZE = 4096,
drivers/input/mouse/elan_i2c_core.c +63 -16

124 lines not on this page · raw message

drivers/input/touchscreen/sur40.c +3 -2
index 880c40b23f66..b7e8c11a6fc2 100644
@@ -126,7 +126,7 @@ struct sur40_image_header {
 #define VIDEO_PACKET_SIZE  16384
 
 /* polling interval (ms) */
-#define POLL_INTERVAL 4
+#define POLL_INTERVAL 1
 
 /* maximum number of contacts FIXME: this is a guess? */
 #define MAX_CONTACTS 64
@@ -448,7 +448,7 @@ static void sur40_process_video(struct sur40_state *sur40)
 
 	/* return error if streaming was stopped in the meantime */
 	if (sur40->sequence == -1)
-		goto err_poll;
+		return;
 
 	/* mark as finished */
 	new_buf->vb.vb2_buf.timestamp = ktime_get_ns();
@@ -736,6 +736,7 @@ static int sur40_start_streaming(struct vb2_queue *vq, unsigned int count)
 static void sur40_stop_streaming(struct vb2_queue *vq)
 {
 	struct sur40_state *sur40 = vb2_get_drv_priv(vq);
+	vb2_wait_for_all_buffers(vq);
 	sur40->sequence = -1;
 
 	/* Release all active buffers */
drivers/iommu/amd_iommu.c +29 -11
index 634f636393d5..2511c8b6aada 100644
@@ -466,9 +466,11 @@ static void init_iommu_group(struct device *dev)
 	if (!domain)
 		goto out;
 
-	dma_domain = to_pdomain(domain)->priv;
+	if (to_pdomain(domain)->flags == PD_DMA_OPS_MASK) {
+		dma_domain = to_pdomain(domain)->priv;
+		init_unity_mappings_for_device(dev, dma_domain);
+	}
 
-	init_unity_mappings_for_device(dev, dma_domain);
 out:
 	iommu_group_put(group);
 }
@@ -2512,8 +2514,15 @@ static void update_device_table(struct protection_domain *domain)
 {
 	struct iommu_dev_data *dev_data;
 
-	list_for_each_entry(dev_data, &domain->dev_list, list)
+	list_for_each_entry(dev_data, &domain->dev_list, list) {
 		set_dte_entry(dev_data->devid, domain, dev_data->ats.enabled);
+
+		if (dev_data->devid == dev_data->alias)
+			continue;
+
+		/* There is an alias, update device table entry for it */
+		set_dte_entry(dev_data->alias, domain, dev_data->ats.enabled);
+	}
 }
 
 static void update_domain(struct protection_domain *domain)
@@ -3103,9 +3112,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned type)
 static void amd_iommu_domain_free(struct iommu_domain *dom)
 {
 	struct protection_domain *domain;
-
-	if (!dom)
-		return;
+	struct dma_ops_domain *dma_dom;
 
 	domain = to_pdomain(dom);
 
@@ -3114,13 +3121,24 @@ static void amd_iommu_domain_free(struct iommu_domain *dom)
 
 	BUG_ON(domain->dev_cnt != 0);
 
-	if (domain->mode != PAGE_MODE_NONE)
-		free_pagetable(domain);
+	if (!dom)
+		return;
+
+	switch (dom->type) {
+	case IOMMU_DOMAIN_DMA:
+		dma_dom = domain->priv;
+		dma_ops_domain_free(dma_dom);
+		break;
+	default:
+		if (domain->mode != PAGE_MODE_NONE)
+			free_pagetable(domain);
 
-	if (domain->flags & PD_IOMMUV2_MASK)
-		free_gcr3_table(domain);
+		if (domain->flags & PD_IOMMUV2_MASK)
+			free_gcr3_table(domain);
 
-	protection_domain_free(domain);
+		protection_domain_free(domain);
+		break;
+	}
 }
 
 static void amd_iommu_detach_device(struct iommu_domain *dom,
drivers/iommu/exynos-iommu.c +1 -0
index 5ecc86cb74c8..e27e3b7df4e7 100644
@@ -709,6 +709,7 @@ static struct platform_driver exynos_sysmmu_driver __refdata = {
 		.name		= "exynos-sysmmu",
 		.of_match_table	= sysmmu_of_match,
 		.pm		= &sysmmu_pm_ops,
+		.suppress_bind_attrs = true,
 	}
 };
 
drivers/iommu/intel-iommu.c +1 -1
index 323dac9900ba..d416242c4ab8 100644
@@ -2076,7 +2076,7 @@ out_unlock:
 	spin_unlock(&iommu->lock);
 	spin_unlock_irqrestore(&device_domain_lock, flags);
 
-	return 0;
+	return ret;
 }
 
 struct domain_context_mapping_data {
drivers/iommu/io-pgtable-arm.c +1 -1
index a1ed1b73fed4..f5c90e1366ce 100644
@@ -576,7 +576,7 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
 	return 0;
 
 found_translation:
-	iova &= (ARM_LPAE_GRANULE(data) - 1);
+	iova &= (ARM_LPAE_BLOCK_SIZE(lvl, data) - 1);
 	return ((phys_addr_t)iopte_to_pfn(pte,data) << data->pg_shift) | iova;
 }
 
drivers/md/dm-flakey.c +15 -8
index b7341de87015..4bb49cd602e9 100644
@@ -289,10 +289,16 @@ static int flakey_map(struct dm_target *ti, struct bio *bio)
 		pb->bio_submitted = true;
 
 		/*
-		 * Map reads as normal.
+		 * Map reads as normal only if corrupt_bio_byte set.
 		 */
-		if (bio_data_dir(bio) == READ)
-			goto map_bio;
+		if (bio_data_dir(bio) == READ) {
+			/* If flags were specified, only corrupt those that match. */
+			if (fc->corrupt_bio_byte && (fc->corrupt_bio_rw == READ) &&
+			    all_corrupt_bio_flags_match(bio, fc))
+				goto map_bio;
+			else
+				return -EIO;
+		}
 
 		/*
 		 * Drop writes?
@@ -330,12 +336,13 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio, int error)
 
 	/*
 	 * Corrupt successful READs while in down state.
-	 * If flags were specified, only corrupt those that match.
 	 */
-	if (fc->corrupt_bio_byte && !error && pb->bio_submitted &&
-	    (bio_data_dir(bio) == READ) && (fc->corrupt_bio_rw == READ) &&
-	    all_corrupt_bio_flags_match(bio, fc))
-		corrupt_bio_data(bio, fc);
+	if (!error && pb->bio_submitted && (bio_data_dir(bio) == READ)) {
+		if (fc->corrupt_bio_byte)
+			corrupt_bio_data(bio, fc);
+		else
+			return -EIO;
+	}
 
 	return error;
 }
drivers/md/dm-verity-fec.c +1 -3
index 459a9f8905ed..0f0eb8a3d922 100644
@@ -453,9 +453,7 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io,
 	 */
 
 	offset = block << v->data_dev_block_bits;
-
-	res = offset;
-	div64_u64(res, v->fec->rounds << v->data_dev_block_bits);
+	res = div64_u64(offset, v->fec->rounds << v->data_dev_block_bits);
 
 	/*
 	 * The base RS block we can feed to the interleaver to find out all
drivers/md/dm.c +8 -8
index 1b2f96205361..fd40bcb3937d 100644
@@ -2175,7 +2175,7 @@ static void dm_request_fn(struct request_queue *q)
 		     md_in_flight(md) && rq->bio && rq->bio->bi_vcnt == 1 &&
 		     md->last_rq_pos == pos && md->last_rq_rw == rq_data_dir(rq)) ||
 		    (ti->type->busy && ti->type->busy(ti))) {
-			blk_delay_queue(q, HZ / 100);
+			blk_delay_queue(q, 10);
 			return;
 		}
 
@@ -3128,7 +3128,8 @@ static void unlock_fs(struct mapped_device *md)
  * Caller must hold md->suspend_lock
  */
 static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
-			unsigned suspend_flags, int interruptible)
+			unsigned suspend_flags, int interruptible,
+			int dmf_suspended_flag)
 {
 	bool do_lockfs = suspend_flags & DM_SUSPEND_LOCKFS_FLAG;
 	bool noflush = suspend_flags & DM_SUSPEND_NOFLUSH_FLAG;
@@ -3195,6 +3196,8 @@ static int __dm_suspend(struct mapped_device *md, struct dm_table *map,
 	 * to finish.
 	 */
[… more lines in the raw message]

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

drivers/media/dvb-core/dvb_ringbuffer.c +61 -13

74 lines not on this page · raw message

drivers/media/platform/s5p-mfc/s5p_mfc.c +11 -0
index b16466fe35ee..beb4fd5bd326 100644

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

drivers/media/rc/ir-rc5-decoder.c +1 -1
index 6ffe776abf6b..a0fd4e6b2155 100644

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

drivers/media/rc/nuvoton-cir.c +1 -0
index 99b303b702ac..e8ceb0e2f6d7 100644

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

drivers/media/usb/usbtv/usbtv-audio.c +5 -0
index 78c12d22dfbb..5dab02432e82 100644

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

drivers/media/v4l2-core/videobuf2-core.c +6 -4
index 9fbcb67a9ee6..633fc1ab1d7a 100644

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

drivers/media/v4l2-core/videobuf2-v4l2.c +6 -0
index 0b1b8c7b6ce5..7f366f1b0377 100644

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

drivers/mfd/qcom_rpm.c +41 -14

55 lines not on this page · raw message

drivers/mtd/nand/nand_base.c +1 -1
index 0b0dc29d2af7..77533f7f2429 100644

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

drivers/mtd/ubi/build.c +8 -5
index ef3618299494..0680516bb472 100644

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

drivers/mtd/ubi/vmt.c +18 -7
index 10059dfdc1b6..0138f526474a 100644

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

drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +17 -5
index 5b30922b67ec..2ce319903cfb 100644

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

drivers/net/wireless/intel/iwlwifi/pcie/drv.c +9 -0
index a588b05e38eb..6f020e4ec7dc 100644

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

drivers/net/wireless/intel/iwlwifi/pcie/internal.h +19 -2
index de6974f9c52f..2d8cce290a15 100644

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

drivers/net/wireless/intel/iwlwifi/pcie/rx.c +9 -7
index 0a4a3c502c3c..aaaf2ad6e4da 100644

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

drivers/net/wireless/intel/iwlwifi/pcie/trans.c +4 -9
index f603d7830a6b..d9f139462b31 100644

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

drivers/of/base.c +21 -9
index ebf84e3b56d5..8bb3d1adf1b0 100644

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

drivers/of/dynamic.c +1 -1
index 3033fa3250dc..a2015599ed7e 100644

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

drivers/of/of_private.h +3 -0
index 829469faeb23..18bbb4517e25 100644

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

drivers/pci/quirks.c +6 -4
index ee72ebe18f4b..7902fbf47f89 100644

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

drivers/phy/phy-rcar-gen3-usb2.c +22 -4
index 4be3f5dbbc9f..31156c9c4707 100644

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

drivers/pinctrl/intel/pinctrl-cherryview.c +44 -36

80 lines not on this page · raw message

drivers/platform/x86/hp-wmi.c +6 -1
index 6f145f2d004d..96ffda493266 100644

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

drivers/regulator/s2mps11.c +3 -3
index 02fb6b4ea820..d838e77dd947 100644

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

drivers/remoteproc/remoteproc_core.c +9 -6
index db3958b3f094..fe0539ed9cb5 100644

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

drivers/rtc/rtc-s3c.c +2 -0
index d01ad7e8078e..4e823c4b7a4d 100644

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

drivers/s390/cio/cmf.c +20 -9
index b2afad5a5682..2a34eb5f6161 100644

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

drivers/scsi/lpfc/lpfc_scsi.c +1 -1
index 3bd0be6277b3..c7e5695da4f5 100644

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

drivers/scsi/megaraid/megaraid_sas_base.c +6 -0
index f4b0690450d2..2dab3dc2aa69 100644

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

drivers/soc/qcom/smp2p.c +2 -1
index f1eed7f9dd67..9c2788b8f2c3 100644

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

drivers/spi/spi-pxa2xx.c +8 -1
index fe07c0592b44..daf28443b7ad 100644

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

drivers/target/iscsi/iscsi_target.c +16 -6
index 50f3d3a0dd7b..39b928c2849d 100644

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

drivers/target/iscsi/iscsi_target_login.c +3 -2
index b5212f0f9571..adf419fa4291 100644

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

drivers/target/target_core_device.c +5 -3
index a4046ca6e60d..6b423485c5d6 100644

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

drivers/target/target_core_file.c +1 -2
index 75f0f08b2a34..79291869bce6 100644

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

drivers/target/target_core_iblock.c +1 -2
index 7c4efb4417b0..2077bc28640a 100644

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

drivers/target/target_core_internal.h +1 -0
index fc91e85f54ba..e2c970a9d61c 100644

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

drivers/target/target_core_sbc.c +1 -1
index a9057aa07176..04f616b3ba0a 100644

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

drivers/target/target_core_transport.c +43 -35

78 lines not on this page · raw message

drivers/tty/serial/atmel_serial.c +8 -6
index 954941dd8124..f9c798cba83f 100644

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

drivers/tty/serial/msm_serial.c +1 -1
index b7d80bd57db9..7d62610d9de5 100644

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

drivers/tty/serial/samsung.c +13 -5
index 99bb23161dd6..f0bd2ec0db59 100644

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

drivers/usb/core/quirks.c +3 -0
index 944a6dca0fcb..d2e50a27140c 100644

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

drivers/usb/dwc3/gadget.c +11 -5
index 07248ff1be5c..716f4f051a0a 100644

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

drivers/usb/gadget/udc/atmel_usba_udc.c +2 -0
index 18569de06b04..bb1f6c8f0f01 100644

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

drivers/usb/gadget/udc/pch_udc.c +8 -8
index ebc51ec5790a..71751429814f 100644

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

drivers/usb/renesas_usbhs/fifo.c +14 -4
index 7be4e7d57ace..280ed5ff021b 100644

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

drivers/usb/renesas_usbhs/mod_gadget.c +8 -1
index 30345c2d01be..50f3363cc382 100644

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

drivers/usb/serial/option.c +3 -0
index d96d423d00e6..8e07536c233a 100644

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

drivers/virtio/virtio_balloon.c +2 -0
index 476c0e3a7150..f6ea8f4ba7cf 100644

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

drivers/w1/masters/omap_hdq.c +0 -2
index a2eec97d5064..bb09de633939 100644

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

fs/btrfs/extent_io.c +0 -6
index 75533adef998..92fe3f8012db 100644

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

fs/btrfs/file.c +5 -7
index 2234e88cf674..b56887b35889 100644

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

fs/cachefiles/namei.c +3 -2
index 4ae75006e73b..3f7c2cd41f8f 100644

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

fs/cifs/cifs_fs_sb.h +4 -0
index 3182273a3407..1418daa03d95 100644

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

fs/cifs/cifsencrypt.c +10 -6
index 6aeb8d4616a4..8347c90cf483 100644

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

fs/cifs/cifsfs.c +13 -1
index 5d841f39c4b7..6bbec5e784cd 100644

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

fs/cifs/connect.c +52 -1

53 lines not on this page · raw message

fs/cifs/dir.c +39 -5

44 lines not on this page · raw message

fs/cifs/inode.c +20 -2
index 514dadb0575d..b87efd0c92d6 100644

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

fs/cifs/smb2ops.c +29 -1
index 3525ed756173..505e6d6406fd 100644

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

fs/jbd2/commit.c +1 -1
index 70078096117d..78313adb3c95 100644

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

fs/nfs/nfs4proc.c +29 -28

57 lines not on this page · raw message

fs/nfs/pnfs.c +23 -12
index 0fbe734cc38c..7d992362ff04 100644

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

fs/nfs/write.c +4 -1
index e1c74d3db64d..649fa5e26050 100644

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

fs/nfsd/nfs4state.c +48 -17

65 lines not on this page · raw message

fs/overlayfs/super.c +2 -1
index 9a7693d5f8ff..6db75cbb668f 100644

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

fs/xfs/xfs_aops.c +12 -3
index 4c463b99fe57..a36a5a418f7d 100644

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

include/linux/backing-dev-defs.h +1 -0
index 3f103076d0bf..c357f27d5483 100644

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

include/linux/backing-dev.h +1 -0
index c82794f20110..89d3de3e096b 100644

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

include/linux/bio.h +3 -0
index 9faebf7f9a33..75fadd28eec8 100644

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

include/linux/mlx5/qp.h +2 -2
index ab310819ac36..7879bf411891 100644

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

include/rdma/ib_verbs.h +6 -0
index 7e440d41487a..e694f02d42e3 100644

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

include/target/target_core_backend.h +1 -1
index d8ab5101fad5..f6f3bc52c1ac 100644

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

include/target/target_core_base.h +1 -0
index b316b44d03f3..fb8e3b6febdf 100644

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

include/target/target_core_fabric.h +0 -1
index de44462a7680..5cd6faa6e0d1 100644

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

include/trace/events/sunrpc.h +34 -13

47 lines not on this page · raw message

kernel/auditsc.c +164 -168

332 lines not on this page · raw message

kernel/cgroup.c +8 -10
index 75c0ff00aca6..e0be49fc382f 100644

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

kernel/module.c +9 -4
index 5f71aa63ed2a..6458a2f17d58 100644

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

mm/backing-dev.c +19 -0
index ed173b8ae8f2..9269911d10dd 100644

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

mm/hugetlb.c +4 -0
index addfe4accc07..d9ec1a5b37ff 100644

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

net/bluetooth/l2cap_sock.c +1 -1
index 388ee8b59145..1842141baedb 100644

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

net/netlabel/netlabel_kapi.c +10 -2
index 1325776daa27..bd007a9fd921 100644

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

scripts/recordmcount.c +8 -1
index e167592793a7..42396a74405d 100644

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

sound/hda/array.c +3 -1
index 516795baa7db..5dfa610e4471 100644

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

sound/pci/hda/hda_intel.c +2 -0
index 6f8ea13323c1..89dacf9b4e6c 100644

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

sound/pci/hda/patch_realtek.c +28 -0
index abcb5a6a1cd9..f25479ba3981 100644

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

tools/objtool/.gitignore +1 -0
index a0b3128bb31f..d3102c865a95 100644

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

virt/kvm/kvm_main.c +2 -0
index 48bd520fc702..dd25346ec356 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.