Skip to contentSkip to conversation

drm-misc-fixes

GIT PULL Sean Paul 6 participants 8 messages May 25, 2017 – May 29, 2017

lore
Share & tools
lore

Sean Paul

author
#0 lore raw

Hi Dave,
A handful of fixes for you this week, nothing overly complex. The pull is noisy because it includes -rc2.

Due to some process miscommunications, Lukas fast-forwarded -fixes and merged the radeon patch without R-b. Patrik also merged the gma500 patch directly without review. Daniel has added safeguards in dim to prevent this from happening in the future. I have run the branch through my usual testing as well as reviewed the patches to ensure everything is above-board.

drm-misc-fixes-2017-05-25:
Core Changes:
- Don't drop vblank reference more than once in cases of ww retry (Daniel)

Driver Changes:
- radeon: Fix oops during radeon probe trying to reference wrong device (Lukas)
- qxl: Avoid sleeping while in atomic context on cursor update (Gabriel)
- gma500: Use VBT mode instead of pre-programmed mode for LVDS (Patrik)

Cc Lukas Wunner <[email protected]>
Cc Gabriel Krisman Bertazi <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Patrik Jakobsson <[email protected]>

Cheers, Sean

The following changes since commit d51aff16e821a755c242e14168f5d4601199eafd:

Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes (2017-05-20 06:00:49 +1000)

are available in the git repository at:

git://anongit.freedesktop.org/git/drm-misc tags/drm-misc-fixes-2017-05-25

for you to fetch changes up to 82bc9a42cf854fdf63155759c0aa790bd1f361b0:

drm/gma500/psb: Actually use VBT mode when it is found (2017-05-23 22:01:07 +0200)

----------------------------------------------------------------
Core Changes:
- Don't drop vblank reference more than once in cases of ww retry (Daniel)

Driver Changes:
- radeon: Fix oops during radeon probe trying to reference wrong device (Lukas)
- qxl: Avoid sleeping while in atomic context on cursor update (Gabriel)
- gma500: Use VBT mode instead of pre-programmed mode for LVDS (Patrik)

Cc Lukas Wunner <[email protected]>
Cc Gabriel Krisman Bertazi <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Patrik Jakobsson <[email protected]>

----------------------------------------------------------------
Adam Ford (1):
ARM: dts: LogicPD Torpedo: Fix camera pin mux

Al Viro (2):
fix unsafe_put_user()
osf_wait4(): fix infoleak

Alan Stern (2):
USB: ene_usb6250: fix DMA to the stack
USB: xhci: fix lock-inversion problem

Alexandre Belloni (2):
watchdog: sama5d4: fix WDDIS handling
watchdog: sama5d4: fix race condition

Andreas Kemnade (1):
ARM: dts: gta04: fix polarity of clocks for mcbsp4

Andrey Korolyov (1):
USB: serial: ftdi_sio: add Olimex ARM-USB-TINY(H) PIDs

Anthony Mallet (1):
USB: serial: ftdi_sio: fix setting latency for unprivileged users

Anton Bondarenko (1):
usb: core: fix potential memory leak in error path during hcd creation

Ard Biesheuvel (1):
i2c: designware: don't infer timings described by ACPI from clock rate

Arnd Bergmann (14):
ARM: omap2+: make omap4_get_cpu1_ns_pa_addr declaration usable
Merge tag 'v4.11-next-fixes' of https://github.com/mbgg/linux-mediatek into fixes Merge tag 'renesas-fixes-for-v4.12' of https://git.kernel.org/.../horms/renesas into fixes Merge tag 'mvebu-dt64-4.12-3' of git://git.infradead.org/linux-mvebu into fixes Merge tag 'mvebu-arm64-4.12-1' of git://git.infradead.org/linux-mvebu into fixes Merge branch 'tee/initial-merge' into fixes
tee: add ARM_SMCCC dependency
soc: imx: add PM dependency for IMX7_PM_DOMAINS
staging: fsl-dpaa2/eth: add ETHERNET dependency
iommu/mediatek: Include linux/dma-mapping.h
watchdog: orion: fix compile-test dependencies
ARM: remove duplicate 'const' annotations'
firmware: ti_sci: fix strncat length check
arm64: dts: rockchip: fix include reference

Bart Van Assche (1):
scsi: scsi_lib: Add #include <scsi/scsi_transport.h>

Baruch Siach (4):
ARM: dts: bcm2835: fix uart0 pinctrl node names
ARM: dts: bcm2835: fix i2c0 pins
ARM: dts: bcm2835: fix uart0/uart1 pins
ARM: dts: bcm2835: add index to the ethernet alias

Bjørn Mork (1):
USB: serial: qcserial: add more Lenovo EM74xx device IDs

Bogdan Mirea (1):
usb: gadget: gserial: check if console kthread exists

Chris Brandt (2):
usb: r8a66597-hcd: decrease timeout
usb: r8a66597-hcd: select a different endpoint on timeout

Christoffer Dall (2):
KVM: arm/arm64: Fix bug when registering redist iodevs
KVM: arm/arm64: Hold slots_lock when unregistering kvm io bus devices

Christoph Hellwig (1):
scsi: MAINTAINERS: update OSD entries

Christophe JAILLET (1):
firmware: Google VPD: Fix memory allocation error handling

Colin Ian King (2):
scsi: lpfc: ensure els_wq is being checked before destroying it
scsi: pmcraid: remove redundant check to see if request_size is less than zero

Dan Carpenter (4):
scsi: lpfc: double lock typo in lpfc_ns_rsp()
scsi: qedf: Cleanup the type of io_log->op
kvm: nVMX: off by one in vmx_write_pml_buffer()
KVM: Silence underflow warning in avic_get_physical_id_entry()

Dan Williams (2):
dax: fix false CONFIG_BLOCK dependency
dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case

Daniel Vetter (1):
drm: Fix deadlock retry loop in page_flip_ioctl

Daniele Palmas (1):
usb: serial: option: add Telit ME910 support

Eric Anholt (1):
watchdog: bcm281xx: Fix use of uninitialized spinlock.

Fabio Estevam (1):
ARM: dts: imx53-qsrb: Pulldown PMIC IRQ pin

Florian Fainelli (2):
Merge tag 'bcm2835-dt-next-2017-03-30' into devicetree/fixes
soc: bcm: brcmstb: Correctly match 7435 SoC

Gabriel Krisman Bertazi (1):
drm: qxl: Delay entering atomic context during cursor update

Ganapatrao Kulkarni (1):
arm64: perf: Ignore exclude_hv when kernel is running in HYP

Gautham R. Shenoy (1):
powerpc/powernv: Set NAPSTATELOST after recovering paca on P9 DD1

Geert Uytterhoeven (1):
soc: renesas: Provide dummy rcar_rst_read_mode_pins() for compile-testing

Gilad Ben-Yossef (1):
staging: MAINTAINERS: add GBY as ccree maintainer

Greg Kroah-Hartman (2):

      Merge tag 'fixes-for-v4.12-rc2' of git://git.kernel.org/.../balbi/usb into usb-linus
      Merge tag 'usb-serial-4.12-rc2' of git://git.kernel.org/.../johan/usb-serial into usb-linus

Gregory CLEMENT (3):
arm64: marvell: enable the Armada 37xx pinctrl driver
ARM64: dts: marvell: Add pinctrl nodes for Armada 3700
ARM64: dts: marvell: armada37xx: add pinctrl definition

Guenter Roeck (5):
scsi: cxlflash: Select IRQ_POLL
staging: typec: tcpm: Drop duplicate PD messages
staging: typec: tcpm: Set correct flags in PD request messages
staging: typec: tcpm: Respond to Discover Identity commands
staging: typec: tcpm: Fix Port Power Role field in PS_RDY messages

Guru Das Srinagesh (1):
staging: typec: Fix sparse warnings about incorrect types

Gustavo A. R. Silva (2):
scsi: qedf: properly update arguments position in function call
block: xen-blkback: add null check to avoid null pointer dereference

Hanjun Guo (2):
irqchip/mbigen: Fix memory mapping code irqchip/mbigen: Fix potential NULL dereferencing

Hannes Reinecke (1):
scsi: libfc: do not flood console with messages 'libfc: queue full ...'

Hans Verkuil (1):
ARM: dts: omap4: enable CEC pin for Pandaboard A4 and ES

Heikki Krogerus (1):
usb: dwc3: pci: add Intel Cannonlake PCI IDs

Ian Chard (1):
staging: ccree: remove extraneous spin_unlock_bh() in error handler

Ian W MORRISON (1):
staging: rtl8723bs: remove re-positioned call to kfree in os_dep/ioctl_cfg80211.c

James Smart (5):
scsi: lpfc: Fix panic on BFS configuration
nvme-fc: correct port role bits
nvme-fc: require target or discovery role for fc-nvme targets
nvme-fc: stop queues on error detection
nvmet-fc: remove target cpu scheduling flag

Jan Kara (1):
fuseblk: Fix warning in super_setup_bdi_name()

Javier Martinez Canillas (1):
staging: typec: fusb302: Fix module autoload

Jens Axboe (1):
Merge branch 'stable/for-jens-4.12' of git://git.kernel.org/.../konrad/xen into for-linus

Jiri Slaby (1):
sisusb_con: fix coccinelle warning

Johan Hovold (16):
USB: serial: ir-usb: fix big-endian baud-rate debug printk
USB: serial: mct_u232: fix big-endian baud-rate handling
USB: serial: io_ti: fix div-by-zero in set_termios
uwb: fix device quirk on big-endian hosts
USB: chaoskey: fix Alea quirk on big-endian hosts
USB: iowarrior: fix info ioctl on big-endian hosts
USB: ehci-platform: fix companion-device leak
USB: core: of: document reference taken by companion helper
USB: gadget: dummy_hcd: fix hub-descriptor removable fields
USB: usbip: fix nonconforming hub descriptor
USB: hub: fix SS hub-descriptor handling
USB: hub: fix non-SS hub-descriptor handling
USB: hub: fix SS max number of ports
USB: host: xhci: use max-port define
of: fdt: add missing allocation-failure check
watchdog: pcwd_usb: fix NULL-deref at probe

John Crispin (1):
arm: dts: mt7623: add clock-frequency to the a7 timer node to mt7623.dtsi

Jon Derrick (1):
nvme: unmap CMB and remove sysfs file in reset path

Juergen Gross (2):
xen: cleanup pvh leftovers from pv-only sources
xen: make xen_flush_tlb_all() static

Julius Werner (1):
drivers: char: mem: Check for address space wraparound with mmap()

KarimAllah Ahmed (1):
iommu/vt-d: Flush the IOTLB to get rid of the initial kdump mappings

Keerthy (1):
ARM: dts: dra7: Add power hold and power controller properties to palmas

Kees Cook (1):
scsi: qedf: Avoid reading past end of buffer

Lars Ellenberg (1):
drbd: fix request leak introduced by locking/atomic, kref: Kill kref_sub()

Leonard Crestez (1):
ARM: dts: imx6sx-sdb: Remove OPP override

Linus Torvalds (23):
Merge tag 'powerpc-4.12-3' of git://git.kernel.org/.../powerpc/linux
Merge tag 'arm64-fixes' of git://git.kernel.org/.../arm64/linux
Merge tag 'armsoc-fixes' of git://git.kernel.org/.../arm/arm-soc
Merge tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/.../robh/linux
Merge tag 'for-linus-4.12b-rc2-tag' of git://git.kernel.org/.../xen/tip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Merge tag 'iommu-fixes-v4.12-rc1' of git://git.kernel.org/.../joro/iommu
Merge branch 'i2c/for-current' of git://git.kernel.org/.../wsa/linux
Merge branch 'libnvdimm-for-next' of git://git.kernel.org/.../nvdimm/nvdimm
Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi
Merge tag 'drm-fixes-for-v4.12-rc2' of git://people.freedesktop.org/~airlied/linux
Merge git://www.linux-watchdog.org/linux-watchdog
Merge tag 'char-misc-4.12-rc2' of git://git.kernel.org/.../gregkh/char-misc
Merge tag 'usb-4.12-rc2' of git://git.kernel.org/.../gregkh/usb
Merge tag 'staging-4.12-rc2' of git://git.kernel.org/.../gregkh/staging
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Merge tag 'trace-v4.12-rc1' of git://git.kernel.org/.../rostedt/linux-trace
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/.../tip/tip
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip
Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs
Clean up x86 unsafe_get/put_user() type handling
x86: fix 32-bit case of __get_user_asm_u64()
Linux 4.12-rc2

Linus Walleij (1):
ARM: configs: add a gemini defconfig

Lukas Wunner (1):
drm/radeon: Fix oops upon driver load on PowerXpress laptops

MaJun (1):
irqchip/mbigen: Fix the clear register offset calculation

Maksim Salau (1):
usb: misc: legousbtower: Fix memory leak

Malcolm Priestley (4):
staging: rtl8192e: rtl92e_fill_tx_desc fix write to mapped out memory.
staging: rtl8192e: fix 2 byte alignment of register BSSIDR.
staging: rtl8192e: rtl92e_get_eeprom_size Fix read size of EPROM_CMD.
staging: rtl8192e: GetTs Fix invalid TID 7 warning.

Marc Zyngier (6):
ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/
arm64: KVM: Do not use stack-protector to compile EL2 code
arm: KVM: Do not use stack-protector to compile HYP code
KVM: arm/arm64: vgic-v2: Do not use Active+Pending state for a HW interrupt
KVM: arm/arm64: vgic-v3: Do not use Active+Pending state for a HW interrupt
KVM: arm/arm64: vgic-v3: Use PREbits to infer the number of ICH_APxRn_EL2 registers

Mark Rutland (1):
arm64/cpufeature: don't use mutex in bringup path

Markus Heiser (1):
doc-rst: fixed kernel-doc directives in usb/typec.rst

Mathias Nyman (3):
usb: xhci: trace URB before giving it back instead of after
xhci: apply PME_STUCK_QUIRK and MISSING_CAS quirk for Denverton
xhci: Fix command ring stop regression in 4.11

Matthias Lange (1):
xhci: remove GFP_DMA flag from allocation

Michael Ellerman (3):
powerpc/modules: If mprofile-kernel is enabled add it to vermagic powerpc/mm: Fix crash in page table dump with huge pages powerpc/mm: Fix virt_addr_valid() etc. on 64-bit hash

Michael Neuling (2):
powerpc/tm: Fix FP and VMX register corruption selftests/powerpc: Test TM and VMX register state

Naveen N. Rao (5):
powerpc/kprobes: Fix handling of instruction emulation on probe re-entry
ftrace: Simplify glob handling in unregister_ftrace_function_probe_func() ftrace/instances: Clear function triggers when removing instances selftests/ftrace: Fix bashisms
selftests/ftrace: Add test to remove instance with active event triggers

Olivier Leveque (1):
staging: typec: tcpci: declare private structure as static

Olof Johansson (6):
Merge tag 'v4.12-rc1' into fixes
devicetree: Move include prefixes from arch to separate directory
Merge tag 'arm-soc/for-4.12/devicetree-fixes' of http://github.com/Broadcom/stblinux into fixes Merge tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux into fixes Merge tag 'imx-fixes-4.12' of git://git.kernel.org/.../shawnguo/linux into fixes Merge tag 'omap-for-v4.12/fixes-v2-signed' of git://git.kernel.org/.../tmlind/linux-omap into fixes

Pan Bian (1):
usb: dwc3: keystone: check return value

Paolo Bonzini (3):
KVM: nVMX: fix EPT permissions as reported in exit qualification
KVM: x86: lower default for halt_poll_ns
iTCO_wdt: all versions count down twice

Patrik Jakobsson (1):
drm/gma500/psb: Actually use VBT mode when it is found

Paul Mackerras (3):
KVM: PPC: Book3S HV: Add radix checks in real-mode hypercall handlers
KVM: PPC: Book3S PR: Check copy_to/from_user return values
KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms

Peter Chen (2):
usb: host: xhci-mem: allocate zeroed Scratchpad Buffer
usb: host: xhci-ring: don't need to clear interrupt pending for MSI enabled hcd

Peter Ujfalusi (1):
usb: musb: tusb6010_omap: Do not reset the other direction's packet size

Phil Elwell (1):
staging: vc04_services: Fix bulk cache maintenance

Radim Krčmář (5):
Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/.../paulus/powerpc
Merge tag 'kvm-arm-for-v4.12-rc2' of git://git.kernel.org/.../kvmarm/kvmarm
KVM: x86: zero base3 of unusable segments
KVM: x86/vPMU: fix undefined shift in intel_pmu_refresh()
KVM: x86: prevent uninitialized variable warning in check_svme()

Randy Dunlap (1):
MAINTAINERS: greybus-dev list is members-only

Ravikumar Kattekola (1):
ARM: dts: dra7: Reduce cpu thermal shutdown temperature

Rob Herring (3):
Partially Revert "of: fix sparse warnings in fdt, irq, reserved mem, and resolver code"
arm64: defconfig: sync with savedefconfig
arm64: defconfig: enable options needed for QCom DB410c board

Robin Murphy (2):
arm64: Remove redundant mov from LL/SC cmpxchg iommu/dma: Don't touch invalid iova_domain members

Roger Quadros (1):
usb: dwc3: gadget: Fix ISO transfer performance

Rui Miguel Silva (3):
staging: typec: fusb302: do not free gpio from managed resource
staging: typec: fusb302: reset i2c_busy state in error
staging: typec: fusb302: refactor resume retry mechanism

Shaohua Li (1):
blktrace: fix integer parse

Shile Zhang (1):
watchdog: wdt_pci: fix build error if define SOFTWARE_REBOOT

Shuah Khan (1):
dtc: check.c fix compile error

Steven Rostedt (1):
tracing: Move postpone selftests to core from early_initcall

Steven Rostedt (VMware) (4):
sched/core: Call __schedule() from do_idle() without enabling preemption
ftrace: Remove #ifdef from code and add clear_ftrace_function_probes() stub
kprobes: Document how optimized kprobes are removed from module unload
tracing: Make sure RCU is watching before calling a stack trace

Suman Anna (1):
uio: fix incorrect memory leak cleanup

Suzuki K Poulose (3):
kvm: arm/arm64: Fix race in resetting stage2 PGD
kvm: arm/arm64: Force reading uncached stage2 PGD
kvm: arm/arm64: Fix use after free of stage2 page table

Thinh Nguyen (1):
usb: dwc3: gadget: Prevent losing events in event cache

Thomas Gleixner (2):
genirq: Fix chained interrupt data ordering tracing/kprobes: Enforce kprobes teardown after testing

Thomas Petazzoni (1):
usb: host: xhci-plat: propagate return value of platform_get_irq()

Tobias Regnery (1):
misc: pci_endpoint_test: select CRC32

Tomas Melin (1):
watchdog: cadence_wdt: fix timeout setting

Tony Lindgren (2):
memory: omap-gpmc: Fix debug output for access width
usb: musb: Fix trying to suspend while active for OTG configurations

Vamsi Krishna Samavedam (1):
USB: core: replace %p with %pK

Vijay Immanuel (1):
nvmet: release the sq ref on rdma read errors

Wanpeng Li (4):
KVM: x86: Fix load damaged SSEx MXCSR register
KVM: VMX: Don't enable EPT A/D feature if EPT feature is disabled
KVM: x86: Fix potential preemption when get the current kvmclock timestamp
KVM: X86: Fix read out-of-bounds vulnerability in kvm pio emulation

Wei Yongjun (3):
xen/9pfs: fix return value check in xen_9pfs_front_probe() xen/9pfs: p9_trans_xen_init and p9_trans_xen_exit can be static
watchdog: zx2967: remove redundant dev_err call in zx2967_wdt_probe()

William Wu (1):
usb: gadget: f_fs: avoid out of bounds access on comp_desc

Willy Tarreau (1):
char: lp: fix possible integer overflow in lp_setup()

Yisheng Xie (1):
staging/android/ion: remove useless document file

Yueyao Zhu (1):

      staging: typec: fusb302: Fix chip->vbus_present init value

Zhichao Huang (2):
KVM: arm: plug potential guest hardware debug leakage
KVM: arm: rename pm_fake handler to trap_raz_wi

Zhou Zhengping (1):
scsi: Skip deleted devices in __scsi_device_lookup

yong mao (1):
ARM64: dts: mediatek: configure some fixed mmc parameters

 .../devicetree/bindings/staging/ion/hi6220-ion.txt |  31 ------
 Documentation/usb/typec.rst                        |   6 +-
 Documentation/watchdog/watchdog-parameters.txt     |   2 +-
 MAINTAINERS                                        |  15 +--
 Makefile                                           |   2 +-
 arch/alpha/kernel/osf_sys.c                        |   6 +-
 arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi        |   2 +-
 arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi        |   2 +-
 arch/arm/boot/dts/bcm283x.dtsi                     |  22 ++--
 arch/arm/boot/dts/dra7-evm.dts                     |   2 +
 arch/arm/boot/dts/dra7.dtsi                        |   4 +
 arch/arm/boot/dts/imx53-qsrb.dts                   |   2 +-
 arch/arm/boot/dts/imx6sx-sdb.dts                   |  17 ---
 arch/arm/boot/dts/include/arm                      |   1 -
 arch/arm/boot/dts/include/arm64                    |   1 -
 arch/arm/boot/dts/include/dt-bindings              |   1 -
 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts  |   6 +-
 arch/arm/boot/dts/mt7623.dtsi                      |   2 +
 arch/arm/boot/dts/omap3-gta04.dtsi                 |   3 +-
 arch/arm/boot/dts/omap4-panda-a4.dts               |   2 +-
 arch/arm/boot/dts/omap4-panda-es.dts               |   2 +-
 arch/arm/configs/gemini_defconfig                  |  68 ++++++++++++
 arch/arm/include/asm/kvm_coproc.h                  |   3 +-
 arch/arm/kvm/coproc.c                              | 106 ++++++++++++------
 arch/arm/kvm/handle_exit.c                         |   4 +-
 arch/arm/kvm/hyp/Makefile                          |   2 +
 arch/arm/kvm/hyp/switch.c                          |   4 +-
 arch/arm/kvm/trace.h                               |   8 +-
 arch/arm/mach-at91/pm.c                            |   2 +-
 arch/arm/mach-bcm/bcm_kona_smc.c                   |   2 +-
 arch/arm/mach-cns3xxx/core.c                       |   2 +-
 arch/arm/mach-omap2/common.h                       |   3 +-
 arch/arm/mach-omap2/omap-mpuss-lowpower.c          |  10 +-
 arch/arm/mach-omap2/omap-smp.c                     |  11 +-
 arch/arm/mach-omap2/prm_common.c                   |   2 +-
 arch/arm/mach-omap2/vc.c                           |   2 +-
 arch/arm/mach-spear/time.c                         |   2 +-
 arch/arm64/Kconfig.platforms                       |   5 +
 arch/arm64/boot/dts/include/arm                    |   1 -
 arch/arm64/boot/dts/include/arm64                  |   1 -
 arch/arm64/boot/dts/include/dt-bindings            |   1 -
 arch/arm64/boot/dts/marvell/armada-3720-db.dts     |   8 ++
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi       |  73 ++++++++++++-
 arch/arm64/boot/dts/mediatek/mt8173-evb.dts        |   3 +
 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts  |   2 +-
 arch/arm64/configs/defconfig                       | 106 ++++++++----------
 arch/arm64/include/asm/atomic_ll_sc.h              |   1 -
 arch/arm64/include/asm/cpufeature.h                |  12 ++-
 arch/arm64/include/asm/kvm_host.h                  |   8 +-
 arch/arm64/kernel/cpufeature.c                     |  23 +++-
 arch/arm64/kernel/perf_event.c                     |  23 ++--
 arch/arm64/kvm/hyp/Makefile                        |   2 +
 arch/cris/boot/dts/include/dt-bindings             |   1 -
 arch/metag/boot/dts/include/dt-bindings            |   1 -
 arch/mips/boot/dts/include/dt-bindings             |   1 -
 arch/powerpc/boot/dts/include/dt-bindings          |   1 -
 arch/powerpc/include/asm/module.h                  |   4 +
 arch/powerpc/include/asm/page.h                    |  12 +++
 arch/powerpc/kernel/idle_book3s.S                  |   2 +-
 arch/powerpc/kernel/kprobes.c                      |   3 +-
 arch/powerpc/kernel/process.c                      |  19 ++++
 arch/powerpc/kvm/Kconfig                           |   2 +-
 arch/powerpc/kvm/Makefile                          |   4 +-
 arch/powerpc/kvm/book3s_64_vio_hv.c                |  13 +++
 arch/powerpc/kvm/book3s_hv_builtin.c               |   9 +-
 arch/powerpc/kvm/book3s_pr_papr.c                  |  70 +++++++++---
 arch/powerpc/kvm/powerpc.c                         |   4 +-
 arch/powerpc/mm/dump_linuxpagetables.c             |   7 +-
 arch/x86/include/asm/kvm_host.h                    |   2 +-
 arch/x86/include/asm/uaccess.h                     |  11 +-
 arch/x86/kernel/fpu/init.c                         |   1 +
 arch/x86/kvm/emulate.c                             |   2 +-
 arch/x86/kvm/paging_tmpl.h                         |  35 +++---
 arch/x86/kvm/pmu_intel.c                           |   2 +-
 arch/x86/kvm/svm.c                                 |   3 +-
 arch/x86/kvm/vmx.c                                 |   4 +-
 arch/x86/kvm/x86.c                                 |  45 +++++---
 arch/x86/xen/enlighten_pv.c                        |  15 +--
 arch/x86/xen/mmu.c                                 |   2 +-
 arch/x86/xen/mmu_pv.c                              | 102 +++++++-----------
 drivers/block/drbd/drbd_req.c                      |  27 ++---
 drivers/block/xen-blkback/xenbus.c                 |   8 +-
 drivers/char/lp.c                                  |   6 +-
 drivers/char/mem.c                                 |   5 +
 drivers/dax/super.c                                |   2 +
 drivers/firmware/google/vpd.c                      |  21 ++--
 drivers/firmware/ti_sci.c                          |   3 +-
 drivers/gpu/drm/drm_plane.c                        |   5 +-
 drivers/gpu/drm/gma500/psb_intel_lvds.c            |  18 ++--
 drivers/gpu/drm/qxl/qxl_display.c                  |   4 +-
 drivers/gpu/drm/radeon/radeon_kms.c                |   2 +-
 drivers/i2c/busses/i2c-designware-platdrv.c        |  18 ++--
 drivers/iommu/dma-iommu.c                          |  13 ++-
 drivers/iommu/intel-iommu.c                        |   5 +-
 drivers/iommu/mtk_iommu_v1.c                       |   1 +
 drivers/irqchip/irq-mbigen.c                       |  17 +--
 drivers/memory/omap-gpmc.c                         |   2 +-
 drivers/misc/Kconfig                               |   1 +
 drivers/nvme/host/fc.c                             |  10 ++
 drivers/nvme/host/pci.c                            |   7 +-
 drivers/nvme/target/core.c                         |   6 ++
 drivers/nvme/target/fc.c                           |   4 +-
 drivers/nvme/target/fcloop.c                       |   1 -
 drivers/nvme/target/nvmet.h                        |   1 +
 drivers/nvme/target/rdma.c                         |   1 +
 drivers/of/fdt.c                                   |   3 +
 drivers/of/of_reserved_mem.c                       |   2 +-
 drivers/scsi/cxlflash/Kconfig                      |   1 +
 drivers/scsi/libfc/fc_fcp.c                        |  15 +--
 drivers/scsi/lpfc/lpfc_crtn.h                      |   1 +
 drivers/scsi/lpfc/lpfc_ct.c                        |   2 +-
 drivers/scsi/lpfc/lpfc_init.c                      |   9 +-
 drivers/scsi/lpfc/lpfc_nvmet.c                     |   1 -
 drivers/scsi/lpfc/lpfc_sli.c                       |  19 ++--
 drivers/scsi/pmcraid.c                             |   3 -
 drivers/scsi/qedf/qedf.h                           |   2 +-
 drivers/scsi/qedf/qedf_els.c                       |   2 +-
 drivers/scsi/qedf/qedf_main.c                      |   2 +-
 drivers/scsi/scsi.c                                |   2 +
 drivers/scsi/scsi_lib.c                            |   1 +
 drivers/soc/bcm/brcmstb/common.c                   |   2 +-
 drivers/soc/imx/Kconfig                            |   3 +-
 drivers/staging/android/ion/devicetree.txt         |  51 ---------
 drivers/staging/ccree/ssi_request_mgr.c            |   1 -
 drivers/staging/fsl-dpaa2/Kconfig                  |   1 +
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |  24 +++--
 drivers/staging/rtl8192e/rtl819x_TSProc.c          |  15 +--
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c  |   1 -
 drivers/staging/typec/fusb302/fusb302.c            |  86 ++++++++-------
 drivers/staging/typec/pd.h                         |  10 ++
 drivers/staging/typec/pd_vdo.h                     |   4 +-
 drivers/staging/typec/tcpci.c                      |   2 +-
 drivers/staging/typec/tcpm.c                       |  77 +++++++++++++-
 drivers/staging/typec/tcpm.h                       |   3 +
 .../interface/vchiq_arm/vchiq_2835_arm.c           |  31 +++---
 drivers/tee/Kconfig                                |   1 +
 drivers/uio/uio.c                                  |   8 +-
 drivers/usb/core/devio.c                           |  14 +--
 drivers/usb/core/hcd.c                             |   5 +-
 drivers/usb/core/hub.c                             |  27 +++--
 drivers/usb/core/of.c                              |   3 +
 drivers/usb/core/urb.c                             |   2 +-
 drivers/usb/dwc3/dwc3-keystone.c                   |   4 +
 drivers/usb/dwc3/dwc3-pci.c                        |   4 +
 drivers/usb/dwc3/gadget.c                          |  21 +++-
 drivers/usb/gadget/function/f_fs.c                 |  10 +-
 drivers/usb/gadget/function/u_serial.c             |   2 +-
 drivers/usb/gadget/udc/dummy_hcd.c                 |   6 +-
 drivers/usb/host/ehci-platform.c                   |   4 +-
 drivers/usb/host/r8a66597-hcd.c                    |   6 +-
 drivers/usb/host/xhci-hub.c                        |   2 +-
 drivers/usb/host/xhci-mem.c                        |  11 +-
 drivers/usb/host/xhci-pci.c                        |   7 +-
 drivers/usb/host/xhci-plat.c                       |   2 +-
 drivers/usb/host/xhci-ring.c                       |  20 ++--
 drivers/usb/host/xhci.c                            |  13 +--
 drivers/usb/misc/chaoskey.c                        |   2 +-
 drivers/usb/misc/iowarrior.c                       |   2 +-
 drivers/usb/misc/legousbtower.c                    |   1 +
 drivers/usb/misc/sisusbvga/sisusb_con.c            |   2 +-
 drivers/usb/musb/musb_host.c                       |   9 +-
 drivers/usb/musb/tusb6010_omap.c                   |  13 ++-
 drivers/usb/serial/ftdi_sio.c                      |  10 +-
 drivers/usb/serial/ftdi_sio_ids.h                  |   2 +
 drivers/usb/serial/io_ti.c                         |   5 +-
 drivers/usb/serial/ir-usb.c                        |  21 ++--
 drivers/usb/serial/mct_u232.c                      |   2 +-
 drivers/usb/serial/option.c                        |   8 ++
 drivers/usb/serial/qcserial.c                      |   2 +
 drivers/usb/storage/ene_ub6250.c                   |  90 ++++++++++------
 drivers/usb/usbip/vhci_hcd.c                       |  11 +-
 drivers/uwb/i1480/dfu/usb.c                        |   5 +-
 drivers/watchdog/Kconfig                           |   2 +-
 drivers/watchdog/bcm_kona_wdt.c                    |   3 +-
 drivers/watchdog/cadence_wdt.c                     |   2 +-
 drivers/watchdog/iTCO_wdt.c                        |  22 ++--
 drivers/watchdog/pcwd_usb.c                        |   3 +
 drivers/watchdog/sama5d4_wdt.c                     |  77 ++++++++++----
 drivers/watchdog/wdt_pci.c                         |   2 +-
 drivers/watchdog/zx2967_wdt.c                      |   4 +-
 fs/ext2/inode.c                                    |   4 +-
 fs/ext4/inode.c                                    |   4 +-
 fs/fuse/inode.c                                    |   9 +-
 fs/xfs/xfs_iomap.c                                 |   4 +-
 include/kvm/arm_vgic.h                             |   5 +-
 include/linux/dax.h                                |  34 ++++--
 include/linux/kprobes.h                            |   3 +
 include/linux/nvme-fc-driver.h                     |  16 +--
 include/linux/of_irq.h                             |   2 +-
 include/linux/soc/renesas/rcar-rst.h               |   5 +
 include/linux/usb/hcd.h                            |   1 +
 include/uapi/linux/usb/ch11.h                      |   3 +
 kernel/irq/chip.c                                  |   2 +-
 kernel/kprobes.c                                   |   8 +-
 kernel/sched/core.c                                |  25 +++++
 kernel/sched/idle.c                                |   2 +-
 kernel/sched/sched.h                               |   2 +
 kernel/trace/blktrace.c                            |   4 +-
 kernel/trace/ftrace.c                              |  12 ++-
 kernel/trace/trace.c                               |  34 +++++-
 kernel/trace/trace.h                               |   5 +
 kernel/trace/trace_kprobe.c                        |   5 +
 net/9p/trans_xen.c                                 |   8 +-
 scripts/Makefile.lib                               |   2 +-
 scripts/dtc/checks.c                               |   2 +-
 scripts/dtc/include-prefixes/arc                   |   1 +
 scripts/dtc/include-prefixes/arm                   |   1 +
 scripts/dtc/include-prefixes/arm64                 |   1 +
 scripts/dtc/include-prefixes/c6x                   |   1 +
 scripts/dtc/include-prefixes/cris                  |   1 +
 scripts/dtc/include-prefixes/dt-bindings           |   1 +
 scripts/dtc/include-prefixes/h8300                 |   1 +
 scripts/dtc/include-prefixes/metag                 |   1 +
 scripts/dtc/include-prefixes/microblaze            |   1 +
 scripts/dtc/include-prefixes/mips                  |   1 +
 scripts/dtc/include-prefixes/nios2                 |   1 +
 scripts/dtc/include-prefixes/openrisc              |   1 +
 scripts/dtc/include-prefixes/powerpc               |   1 +
 scripts/dtc/include-prefixes/sh                    |   1 +
 scripts/dtc/include-prefixes/xtensa                |   1 +
 tools/testing/selftests/ftrace/ftracetest          |   2 +-
 .../ftrace/test.d/ftrace/func_event_triggers.tc    |   2 +-
 tools/testing/selftests/ftrace/test.d/functions    |   4 +-
 .../ftrace/test.d/instances/instance-event.tc      |   8 +-
 tools/testing/selftests/powerpc/tm/.gitignore      |   1 +
 tools/testing/selftests/powerpc/tm/Makefile        |   4 +-
 .../testing/selftests/powerpc/tm/tm-vmx-unavail.c  | 118 +++++++++++++++++++++
 virt/kvm/arm/hyp/vgic-v3-sr.c                      |  18 ++--
 virt/kvm/arm/mmu.c                                 |  33 +++---
 virt/kvm/arm/vgic/vgic-init.c                      |   5 +-
 virt/kvm/arm/vgic/vgic-mmio-v3.c                   |  12 ++-
 virt/kvm/arm/vgic/vgic-v2.c                        |   7 ++
 virt/kvm/arm/vgic/vgic-v3.c                        |   7 ++
 233 files changed, 1659 insertions(+), 822 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt
 delete mode 120000 arch/arm/boot/dts/include/arm
 delete mode 120000 arch/arm/boot/dts/include/arm64
 delete mode 120000 arch/arm/boot/dts/include/dt-bindings
 create mode 100644 arch/arm/configs/gemini_defconfig
 delete mode 120000 arch/arm64/boot/dts/include/arm
 delete mode 120000 arch/arm64/boot/dts/include/arm64
 delete mode 120000 arch/arm64/boot/dts/include/dt-bindings
 delete mode 120000 arch/cris/boot/dts/include/dt-bindings
 delete mode 120000 arch/metag/boot/dts/include/dt-bindings
 delete mode 120000 arch/mips/boot/dts/include/dt-bindings
 delete mode 120000 arch/powerpc/boot/dts/include/dt-bindings
 delete mode 100644 drivers/staging/android/ion/devicetree.txt
 create mode 120000 scripts/dtc/include-prefixes/arc
 create mode 120000 scripts/dtc/include-prefixes/arm
 create mode 120000 scripts/dtc/include-prefixes/arm64
 create mode 120000 scripts/dtc/include-prefixes/c6x
 create mode 120000 scripts/dtc/include-prefixes/cris
 create mode 120000 scripts/dtc/include-prefixes/dt-bindings
 create mode 120000 scripts/dtc/include-prefixes/h8300
 create mode 120000 scripts/dtc/include-prefixes/metag
 create mode 120000 scripts/dtc/include-prefixes/microblaze
 create mode 120000 scripts/dtc/include-prefixes/mips
 create mode 120000 scripts/dtc/include-prefixes/nios2
 create mode 120000 scripts/dtc/include-prefixes/openrisc
 create mode 120000 scripts/dtc/include-prefixes/powerpc
 create mode 120000 scripts/dtc/include-prefixes/sh
 create mode 120000 scripts/dtc/include-prefixes/xtensa
 create mode 100644 tools/testing/selftests/powerpc/tm/tm-vmx-unavail.c
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 1 line · Sean Paul

The pull is noisy because it includes -rc2.

Looks like I've caused another fine mess by fast-forwarding -fixes. :-(

I followed the docs in drm-misc.rst which say:

* Fast-forward (when possible) -fixes to each released -rc kernel tag, to keep it current. We try to avoid backmerges for bugfix branches, and rebasing isn't an option with multiple committers.

How do you actually handle this? Fast-forward only if Dave has already done so himself?

Thanks,

Lukas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 5 lines · Lukas Wunner
Quoted 1 line · Sean Paul

The pull is noisy because it includes -rc2.

Looks like I've caused another fine mess by fast-forwarding -fixes. :-(

Quoted 8 lines

I followed the docs in drm-misc.rst which say:

* Fast-forward (when possible) -fixes to each released -rc kernel tag, to keep it current. We try to avoid backmerges for bugfix branches, and rebasing isn't an option with multiple committers.

How do you actually handle this? Fast-forward only if Dave has already done so himself?

As long as I'm warned in the pull request I often fast forward to the base if my tree is clean,
just to avoid the pull request having noise in it.

Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
In reply to Sean Paul
Quoted 2 lines · Sean Paul

The pull is noisy
because it includes -rc2.

dim has you covered for this, in case you've rolled forward but Dave hasn't yet, you can regenerate against linus upstream branch for a cleaner pull (but still warn Dave ofc):

$ dim pull-request drm-misc-next origin/master

Cheers, Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 9 lines · Daniel Vetter
Quoted 2 lines · Sean Paul

The pull is noisy
because it includes -rc2.

dim has you covered for this, in case you've rolled forward but Dave hasn't yet, you can regenerate against linus upstream branch for a cleaner pull (but still warn Dave ofc):

$ dim pull-request drm-misc-next origin/master

FWIW this is what I've always done with drm-intel-fixes.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#5 lore raw
Quoted 5 lines · Jani Nikula
Quoted 4 lines · Daniel Vetter
Quoted 2 lines · Sean Paul

The pull is noisy
because it includes -rc2.

Quoted 7 lines
Quoted 5 lines

dim has you covered for this, in case you've rolled forward but Dave hasn't yet, you can regenerate against linus upstream branch for a cleaner pull (but still warn Dave ofc):

$ dim pull-request drm-misc-next origin/master

FWIW this is what I've always done with drm-intel-fixes.

I had considered it, but wanted to make sure the PR merged cleanly into Dave's tree. I'll start basing off Linus' tree for -fixes in the future.

Sean

Quoted 7 lines

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
In reply to Daniel Vetter
Quoted 8 lines · Daniel Vetter
Quoted 1 line · Sean Paul

The pull is noisy because it includes -rc2.

dim has you covered for this, in case you've rolled forward but Dave hasn't yet, you can regenerate against linus upstream branch for a cleaner pull (but still warn Dave ofc):

$ dim pull-request drm-misc-next origin/master

Is it worth documenting this? If so, below is a suggestion. Feel free to rephrase as you see fit.

Thanks,

Lukas

-- >8 --
Subject: [PATCH] drm-misc: Document recommended base for -fixes pulls

Summarize the following discussion on dri-devel:

"dim has you covered for this, in case you've rolled forward but Dave
hasn't yet, you can regenerate against linus upstream branch for a cleaner pull (but still warn Dave ofc):
$ dim pull-request drm-misc-next origin/master" (Daniel)

"FWIW this is what I've always done with drm-intel-fixes." (Jani)

"As long as I'm warned in the pull request I often fast forward to
the base if my tree is clean, just to avoid the pull request having noise in it." (Dave)

Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Sean Paul <[email protected]>
Cc Dave Airlie <[email protected]>
---
 drm-misc.rst | 8 ++++++++
 1 file changed, 8 insertions(+)
drm-misc.rst +8 -0
index d56c3c7..c66ac67 100644
@@ -178,6 +178,14 @@ Maintainers mostly provide services to keep drm-misc running smoothly:
   keep it current. We try to avoid backmerges for bugfix branches, and rebasing
   isn't an option with multiple committers.
 
+* Pull requests become noisy if `-fixes` has been fast-forwarded to Linus'
+  latest -rc tag but drm-upstream hasn't done the same yet: The shortlog
+  will contain not just the queued fixes but also anything else that has
+  landed in Linus' tree in the meantime. The best practice is then to base
+  the pull request on Linus' master branch (rather than drm-upstream) by
+  setting the `upstream` argument for ``dim pull-request`` accordingly.
+  Upstream should be warned that they haven't fast-forwarded yet.
+
 * During the merge-windo blackout, i.e. from -rc6 on until the merge window
   closes with the release of -rc1, try to track `drm-next` with the
   `-next-fixes` branch. Do not advance past -rc1, otherwise the automagic in
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw
Quoted 4 lines · Lukas Wunner
Quoted 3 lines · Daniel Vetter
Quoted 1 line · Sean Paul

The pull is noisy because it includes -rc2.

Quoted 8 lines
Quoted 5 lines

dim has you covered for this, in case you've rolled forward but Dave hasn't yet, you can regenerate against linus upstream branch for a cleaner pull (but still warn Dave ofc):

$ dim pull-request drm-misc-next origin/master

Is it worth documenting this? If so, below is a suggestion. Feel free to rephrase as you see fit.

Great idea, thanks for the patch. Applied&pushed.
-Daniel

Quoted 52 lines

Thanks,

Lukas

-- >8 --
Subject: [PATCH] drm-misc: Document recommended base for -fixes pulls

Summarize the following discussion on dri-devel:

"dim has you covered for this, in case you've rolled forward but Dave
hasn't yet, you can regenerate against linus upstream branch for a cleaner pull (but still warn Dave ofc):
$ dim pull-request drm-misc-next origin/master" (Daniel)

"FWIW this is what I've always done with drm-intel-fixes." (Jani)

"As long as I'm warned in the pull request I often fast forward to
the base if my tree is clean, just to avoid the pull request having noise in it." (Dave)

Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Sean Paul <[email protected]>
Cc Dave Airlie <[email protected]>
---
 drm-misc.rst | 8 ++++++++
 1 file changed, 8 insertions(+)
drm-misc.rst +8 -0
index d56c3c7..c66ac67 100644
@@ -178,6 +178,14 @@ Maintainers mostly provide services to keep drm-misc running smoothly:
   keep it current. We try to avoid backmerges for bugfix branches, and rebasing
   isn't an option with multiple committers.
 
+* Pull requests become noisy if `-fixes` has been fast-forwarded to Linus'
+  latest -rc tag but drm-upstream hasn't done the same yet: The shortlog
+  will contain not just the queued fixes but also anything else that has
+  landed in Linus' tree in the meantime. The best practice is then to base
+  the pull request on Linus' master branch (rather than drm-upstream) by
+  setting the `upstream` argument for ``dim pull-request`` accordingly.
+  Upstream should be warned that they haven't fast-forwarded yet.
+
 * During the merge-windo blackout, i.e. from -rc6 on until the merge window
   closes with the release of -rc1, try to track `drm-next` with the
   `-next-fixes` branch. Do not advance past -rc1, otherwise the automagic in
Signature · 1 line
2.11.0
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx