Merge drm/drm-next into drm-intel-gt-next

Work that needs to land in drm-intel-gt-next depends on two patches only
present in drm-intel-next, absence of which is causing a merge conflict:

3b918f4

Merge drm/drm-next into drm-intel-gt-next

Work that needs to land in drm-intel-gt-next depends on two patches only
present in drm-intel-next, absence of which is causing a merge conflict:

3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS")
ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

show more ...

Merge branch 'linus' into smp/core

Pull in upstream to get the fixes so depending changes can be applied.

Merge drm/drm-next into drm-misc-next

Updating drm-misc-next to the state of Linux v6.6-rc2.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Merge tag 'v6.6-rc4' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge tag 'v6.6-rc2' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge drm/drm-next into drm-intel-next

Sync to v6.6-rc1.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Merge drm/drm-fixes into drm-misc-fixes

Forwarding to v6.6-rc1.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Merge tag 'devicetree-header-cleanups-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree include cleanups from Rob Herring:
"These are the remaining few clean-ups

Merge tag 'devicetree-header-cleanups-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree include cleanups from Rob Herring:
"These are the remaining few clean-ups of DT related includes which
didn't get applied to subsystem trees"

* tag 'devicetree-header-cleanups-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
ipmi: Explicitly include correct DT includes
tpm: Explicitly include correct DT includes
lib/genalloc: Explicitly include correct DT includes
parport: Explicitly include correct DT includes
sbus: Explicitly include correct DT includes
mux: Explicitly include correct DT includes
macintosh: Explicitly include correct DT includes
hte: Explicitly include correct DT includes
EDAC: Explicitly include correct DT includes
clocksource: Explicitly include correct DT includes
sparc: Explicitly include correct DT includes
riscv: Explicitly include correct DT includes

show more ...

sparc: Explicitly include correct DT includes

The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it was merged into the regular platform bus.
As part of that

sparc: Explicitly include correct DT includes

The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it was merged into the regular platform bus.
As part of that merge prepping Arm DT support 13 years ago, they
"temporarily" include each other. They also include platform_device.h
and of.h. As a result, there's a pretty much random mix of those include
files used throughout the tree. In order to detangle these headers and
replace the implicit includes with struct declarations, users need to
explicitly include the correct includes.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://lore.kernel.org/all/20230718143211.1066810-1-robh@kernel.org/
Signed-off-by: Rob Herring <robh@kernel.org>

show more ...

Merge tag 'v4.20' into for-linus

Sync with mainline to get linux/overflow.h among other things.

Merge tag 'v4.20' into next

Merge with mainline to bring in the new APIs.

Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.

Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

show more ...

Merge tag 'v4.18-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Linux 4.18-rc2

Merge tag 'v4.18-rc2' into next-general

Merge to Linux 4.18-rc2 for security subsystem developers.

Merge branch 'linus' into x86/urgent

Required to queue a dependent fix.

Merge branch 'for-4.18/alps' into for-linus

hid-alps driver cleanups wrt. t4_read_write_register() handling
from Christophe Jaillet

Merge tag 'pci-v4.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:

- unify AER decoding for native and ACPI CPER sources (Alexandru

Merge tag 'pci-v4.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:

- unify AER decoding for native and ACPI CPER sources (Alexandru
Gagniuc)

- add TLP header info to AER tracepoint (Thomas Tai)

- add generic pcie_wait_for_link() interface (Oza Pawandeep)

- handle AER ERR_FATAL by removing and re-enumerating devices, as
Downstream Port Containment does (Oza Pawandeep)

- factor out common code between AER and DPC recovery (Oza Pawandeep)

- stop triggering DPC for ERR_NONFATAL errors (Oza Pawandeep)

- share ERR_FATAL recovery path between AER and DPC (Oza Pawandeep)

- disable ASPM L1.2 substate if we don't have LTR (Bjorn Helgaas)

- respect platform ownership of LTR (Bjorn Helgaas)

- clear interrupt status in top half to avoid interrupt storm (Oza
Pawandeep)

- neaten pci=earlydump output (Andy Shevchenko)

- avoid errors when extended config space inaccessible (Gilles Buloz)

- prevent sysfs disable of device while driver attached (Christoph
Hellwig)

- use core interface to report PCIe link properties in bnx2x, bnxt_en,
cxgb4, ixgbe (Bjorn Helgaas)

- remove unused pcie_get_minimum_link() (Bjorn Helgaas)

- fix use-before-set error in ibmphp (Dan Carpenter)

- fix pciehp timeouts caused by Command Completed errata (Bjorn
Helgaas)

- fix refcounting in pnv_php hotplug (Julia Lawall)

- clear pciehp Presence Detect and Data Link Layer Status Changed on
resume so we don't miss hotplug events (Mika Westerberg)

- only request pciehp control if we support it, so platform can use
ACPI hotplug otherwise (Mika Westerberg)

- convert SHPC to be builtin only (Mika Westerberg)

- request SHPC control via _OSC if we support it (Mika Westerberg)

- simplify SHPC handoff from firmware (Mika Westerberg)

- fix an SHPC quirk that mistakenly included *all* AMD bridges as well
as devices from any vendor with device ID 0x7458 (Bjorn Helgaas)

- assign a bus number even to non-native hotplug bridges to leave
space for acpiphp additions, to fix a common Thunderbolt xHCI
hot-add failure (Mika Westerberg)

- keep acpiphp from scanning native hotplug bridges, to fix common
Thunderbolt hot-add failures (Mika Westerberg)

- improve "partially hidden behind bridge" messages from core (Mika
Westerberg)

- add macros for PCIe Link Control 2 register (Frederick Lawler)

- replace IB/hfi1 custom macros with PCI core versions (Frederick
Lawler)

- remove dead microblaze and xtensa code (Bjorn Helgaas)

- use dev_printk() when possible in xtensa and mips (Bjorn Helgaas)

- remove unused pcie_port_acpi_setup() and portdrv_acpi.c (Bjorn
Helgaas)

- add managed interface to get PCI host bridge resources from OF (Jan
Kiszka)

- add support for unbinding generic PCI host controller (Jan Kiszka)

- fix memory leaks when unbinding generic PCI host controller (Jan
Kiszka)

- request legacy VGA framebuffer only for VGA devices to avoid false
device conflicts (Bjorn Helgaas)

- turn on PCI_COMMAND_IO & PCI_COMMAND_MEMORY in pci_enable_device()
like everybody else, not in pcibios_fixup_bus() (Bjorn Helgaas)

- add generic enable function for simple SR-IOV hardware (Alexander
Duyck)

- use generic SR-IOV enable for ena, nvme (Alexander Duyck)

- add ACS quirk for Intel 7th & 8th Gen mobile (Alex Williamson)

- add ACS quirk for Intel 300 series (Mika Westerberg)

- enable register clock for Armada 7K/8K (Gregory CLEMENT)

- reduce Keystone "link already up" log level (Fabio Estevam)

- move private DT functions to drivers/pci/ (Rob Herring)

- factor out dwc CONFIG_PCI Kconfig dependencies (Rob Herring)

- add DesignWare support to the endpoint test driver (Gustavo
Pimentel)

- add DesignWare support for endpoint mode (Gustavo Pimentel)

- use devm_ioremap_resource() instead of devm_ioremap() in dra7xx and
artpec6 (Gustavo Pimentel)

- fix Qualcomm bitwise NOT issue (Dan Carpenter)

- add Qualcomm runtime PM support (Srinivas Kandagatla)

- fix DesignWare enumeration below bridges (Koen Vandeputte)

- use usleep() instead of mdelay() in endpoint test (Jia-Ju Bai)

- add configfs entries for pci_epf_driver device IDs (Kishon Vijay
Abraham I)

- clean up pci_endpoint_test driver (Gustavo Pimentel)

- update Layerscape maintainer email addresses (Minghuan Lian)

- add COMPILE_TEST to improve build test coverage (Rob Herring)

- fix Hyper-V bus registration failure caused by domain/serial number
confusion (Sridhar Pitchai)

- improve Hyper-V refcounting and coding style (Stephen Hemminger)

- avoid potential Hyper-V hang waiting for a response that will never
come (Dexuan Cui)

- implement Mediatek chained IRQ handling (Honghui Zhang)

- fix vendor ID & class type for Mediatek MT7622 (Honghui Zhang)

- add Mobiveil PCIe host controller driver (Subrahmanya Lingappa)

- add Mobiveil MSI support (Subrahmanya Lingappa)

- clean up clocks, MSI, IRQ mappings in R-Car probe failure paths
(Marek Vasut)

- poll more frequently (5us vs 5ms) while waiting for R-Car data link
active (Marek Vasut)

- use generic OF parsing interface in R-Car (Vladimir Zapolskiy)

- add R-Car V3H (R8A77980) "compatible" string (Sergei Shtylyov)

- add R-Car gen3 PHY support (Sergei Shtylyov)

- improve R-Car PHYRDY polling (Sergei Shtylyov)

- clean up R-Car macros (Marek Vasut)

- use runtime PM for R-Car controller clock (Dien Pham)

- update arm64 defconfig for Rockchip (Shawn Lin)

- refactor Rockchip code to facilitate both root port and endpoint
mode (Shawn Lin)

- add Rockchip endpoint mode driver (Shawn Lin)

- support VMD "membar shadow" feature (Jon Derrick)

- support VMD bus number offsets (Jon Derrick)

- add VMD "no AER source ID" quirk for more device IDs (Jon Derrick)

- remove unnecessary host controller CONFIG_PCIEPORTBUS Kconfig
selections (Bjorn Helgaas)

- clean up quirks.c organization and whitespace (Bjorn Helgaas)

* tag 'pci-v4.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (144 commits)
PCI/AER: Replace struct pcie_device with pci_dev
PCI/AER: Remove unused parameters
PCI: qcom: Include gpio/consumer.h
PCI: Improve "partially hidden behind bridge" log message
PCI: Improve pci_scan_bridge() and pci_scan_bridge_extend() doc
PCI: Move resource distribution for single bridge outside loop
PCI: Account for all bridges on bus when distributing bus numbers
ACPI / hotplug / PCI: Drop unnecessary parentheses
ACPI / hotplug / PCI: Mark stale PCI devices disconnected
ACPI / hotplug / PCI: Don't scan bridges managed by native hotplug
PCI: hotplug: Add hotplug_is_native()
PCI: shpchp: Add shpchp_is_native()
PCI: shpchp: Fix AMD POGO identification
PCI: mobiveil: Add MSI support
PCI: mobiveil: Add Mobiveil PCIe Host Bridge IP driver
PCI/AER: Decode Error Source Requester ID
PCI/AER: Remove aer_recover_work_func() forward declaration
PCI/DPC: Use the generic pcie_do_fatal_recovery() path
PCI/AER: Pass service type to pcie_do_fatal_recovery()
PCI/DPC: Disable ERR_NONFATAL handling by DPC
...

show more ...

Merge branch 'pci/sparc'

- request legacy VGA framebuffer only for VGA devices to avoid false
device conflicts (Bjorn Helgaas)

- turn on PCI_COMMAND_IO & PCI_COMMAND_MEMORY in pci_enable_de

Merge branch 'pci/sparc'

- request legacy VGA framebuffer only for VGA devices to avoid false
device conflicts (Bjorn Helgaas)

- turn on PCI_COMMAND_IO & PCI_COMMAND_MEMORY in pci_enable_device() like
everybody else, not in pcibios_fixup_bus() (Bjorn Helgaas)

* pci/sparc:
sparc/PCI: Use dev_printk() when possible
sparc32/PCI/PCIC: Converge device enable path
sparc32/PCI/LEON: Converge device enable path
sparc/PCI: Request legacy VGA framebuffer only for VGA devices

show more ...

Merge branch 'next' into for-linus

Prepare input updates for 4.18 merge window.

Merge branches 'clk-warn', 'clk-core', 'clk-spear' and 'clk-qcom-msm8998' into clk-next

* clk-warn:
clk: Print the clock name and warning cause

* clk-core:
clk: Remove clk_init_cb typedef

* cl

Merge branches 'clk-warn', 'clk-core', 'clk-spear' and 'clk-qcom-msm8998' into clk-next

* clk-warn:
clk: Print the clock name and warning cause

* clk-core:
clk: Remove clk_init_cb typedef

* clk-spear:
clk: spear: fix WDT clock definition on SPEAr600

* clk-qcom-msm8998:
clk: qcom: Add MSM8998 Global Clock Control (GCC) driver

show more ...

Merge tag 'v4.17-rc6' into next

Sync up with mainline to bring in Atmel controller changes for Caroline.

sparc/PCI: Use dev_printk() when possible

Use the pci_info() and pci_err() wrappers for dev_printk() when possible.

Log PCI device vendor and device IDs and BAR information in the same format
used

sparc/PCI: Use dev_printk() when possible

Use the pci_info() and pci_err() wrappers for dev_printk() when possible.

Log PCI device vendor and device IDs and BAR information in the same format
used by other architectures.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

show more ...

Merge branch 'drm-intel-next-queued' into gvt-next

Signed-off-by: Zhi Wang <zhi.a.wang@intel.com>

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

drm-misc-next is still based on v4.16-rc7, and was getting a bit stale.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.inte

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

drm-misc-next is still based on v4.16-rc7, and was getting a bit stale.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

show more ...

Merge drm/drm-next into drm-intel-next-queued

Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.f

Merge drm/drm-next into drm-intel-next-queued

Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

show more ...