Merge tag 'v5.18'

Linux 5.18

Merge tag 'v5.17-rc4' into for-linus

Merge with mainline to get the Intel ASoC generic helpers header and
other changes.

Merge tag 'v5.16' into next

Sync up with mainline to bring in the latest API changes.

Merge branch 'next' into for-linus

Prepare input updates for 5.17 merge window.

Merge branch 'for-next' into for-linus

Pull 5.17 materials.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

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

Backmerging to bring drm-misc-next-fixes up to the latest state for
the current release cycle.

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

Merge branch 'reset/of-get-optional-exclusive' of git://git.pengutronix.de/pza/linux into timers/drivers/next

"Add optional variant of of_reset_control_get_exclusive(). If the
requested reset is not

Merge branch 'reset/of-get-optional-exclusive' of git://git.pengutronix.de/pza/linux into timers/drivers/next

"Add optional variant of of_reset_control_get_exclusive(). If the
requested reset is not specified in the device tree, this function
returns NULL instead of an error."

This dependency is needed for the Generic Timer Module (a.k.a OSTM)
support for RZ/G2L.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

show more ...

Merge tag 'v5.15' into next

Sync up with the mainline to get the latest APIs and DT bindings.

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

Sync up with drm-next to get v5.16-rc2.

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

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

Thomas needs the dma_resv_for_each_fence API for i915/ttm async migration
work.

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

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

Backmerging from drm/drm-next for v5.16-rc1.

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

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

We need -rc1 to address a breakage in drm/scheduler affecting panfrost.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up some tools/perf/ patches that went via tip/perf/core, such
as:

tools/perf: Add mem_hops field in perf_mem_data_src structu

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up some tools/perf/ patches that went via tip/perf/core, such
as:

tools/perf: Add mem_hops field in perf_mem_data_src structure

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

show more ...

Merge tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM defconfig updates from Arnd Bergmann:
"These are the usual changes to enable newly added driver by defau

Merge tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM defconfig updates from Arnd Bergmann:
"These are the usual changes to enable newly added driver by default,
and to do some housekeeping around changing Kconfig symbols"

* tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (33 commits)
arm64: defconfig: Enable Qualcomm LMH driver
arm64: defconfig: Enable Qualcomm prima/pronto drivers
arm64: defconfig: Enable Sleep stats driver
arm64: defconfig: Visconti: Enable PCIe host controller
ARM: configs: aspeed: Remove unused USB gadget devices
ARM: config: aspeed: Enable Network Block Device
ARM: configs: aspeed: Enable pstore and lockup detectors
ARM: configs: aspeed: Enable commonly used drivers
ARM: configs: aspeed: Disable IPV6 SIT device
ARM: imx_v6_v7_defconfig: Enable HID I2C
arm64: defconfig: Enable QTI SC7280 pinctrl, gcc and interconnect
arm64: defconfig: Disable firmware sysfs fallback
ARM: mvebu_v7_defconfig: rebuild default configuration
ARM: mvebu_v7_defconfig: enable mtd physmap
arm64: defconfig: Enable few Tegra210 based AHUB drivers
arm64: defconfig: drop obsolete ARCH_* configs
ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf
ARM: imx_v6_v7_defconfig: build imx sdma driver as module
ARM: imx_v6_v7_defconfig: rebuild default configuration
ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant
...

show more ...

Merge tag 'aspeed-5.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/defconfigs

ASPEED defconfig updates for 5.16

- Add options that are enabled in the common OpenB

Merge tag 'aspeed-5.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/defconfigs

ASPEED defconfig updates for 5.16

- Add options that are enabled in the common OpenBMC kernel

- Re-enable DRM_FBDEV_EMULATION

- Turn on the various sensor drivers that are used in BMC systems,
so we can boot test where they are modelled in Qemu

* tag 'aspeed-5.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: configs: aspeed: Remove unused USB gadget devices
ARM: config: aspeed: Enable Network Block Device
ARM: configs: aspeed: Enable pstore and lockup detectors
ARM: configs: aspeed: Enable commonly used drivers
ARM: configs: aspeed: Disable IPV6 SIT device
ARM: configs: aspeed_g5: Reneable DRM_FBDEV_EMULATION

Link: https://lore.kernel.org/r/CACPK8Xd0mVn2Cy7d=VBTDMpU=WHrftsiihwH224ekFSDGKAbyA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

show more ...

ARM: configs: aspeed: Disable IPV6 SIT device

No one is using this device on OpenBMC systems, and there is no code to
manage it in phosphor-networkd (the default OpenBMC userspace) as of
March 2021:

ARM: configs: aspeed: Disable IPV6 SIT device

No one is using this device on OpenBMC systems, and there is no code to
manage it in phosphor-networkd (the default OpenBMC userspace) as of
March 2021:

> [...] if you don't add IPv6 addresses to the sit interface
> it doesn't do anything. The defacto way to do that on an interface in
> OpenBMC is to have it managed by phosphor-networkd. On top of this, to
> support sit you would need a way to configure the local / remote IPv4
> addresses used to back it.

Signed-off-by: Joel Stanley <joel@jms.id.au>

show more ...

Merge branch 'pruss-fix' into fixes

Merge in a fix for pruss reset issue caused by enabling pruss for am335x.

Merge tag 'v5.15-rc2' into spi-5.15

Linux 5.15-rc2

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

Catch-up on 5.15-rc1 and sync with drm-intel-gt-next
to prepare the PXP topic branch.

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

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

Close the divergence which has caused patches not to apply and
have a solid baseline for the PXP patches that Rodrigo will send
a topic branch PR for.

Sign

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

Close the divergence which has caused patches not to apply and
have a solid baseline for the PXP patches that Rodrigo will send
a topic branch PR for.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

show more ...

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

Kickstart new drm-misc-next cycle.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Merge branch 'linus' into smp/urgent

Ensure that all usage sites of get/put_online_cpus() except for the
struggler in drivers/thermal are gone. So the last user and the deprecated
inlines can be rem

Merge branch 'linus' into smp/urgent

Ensure that all usage sites of get/put_online_cpus() except for the
struggler in drivers/thermal are gone. So the last user and the deprecated
inlines can be removed.

show more ...

Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM defconfig updates from Arnd Bergmann:
"The usual set of defconfig updates, including one new defconfig f

Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM defconfig updates from Arnd Bergmann:
"The usual set of defconfig updates, including one new defconfig file
for the new sama7 family of SoCs"

* tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: config: aspeed: Regenerate defconfigs
ARM: config: aspeed_g4: Enable EDAC and SPGIO
ARM: config: aspeed: Enable KCS adapter for raw SerIO
ARM: config: aspeed: Enable hardened allocator feature
ARM: imx_v6_v7_defconfig: enable driver of the LTC3676 PMIC
ARM: multi_v7_defconfig: Enable CONFIG_TEGRA30_TSENSOR
ARM: multi_v7_defconfig: Enable Acer A500 drivers
ARM: tegra: Rebuild default configuration
ARM: tegra: Enable CONFIG_CROS_EC
ARM: tegra: Enable Acer A500 drivers
ARM: tegra: Enable CONFIG_FB
ARM: tegra: Enable CONFIG_TEGRA30_TSENSOR
ARM: configs: multi_v7: enable PL35x NAND controller
arm64: defconfig: Enable Qualcomm MSM8996 CPU clock driver
ARM: imx_v6_v7_defconfig: Let CONFIG_SCSI_LOWLEVEL be selected
ARM: imx_v6_v7_defconfig: Select CONFIG_KPROBES
ARM: multi_v7_defconfig: Enable CONFIG_MMC_MESON_MX_SDHC
ARM: multi_v7_defconfig: add sama7g5 SoC
ARM: configs: at91: add defconfig for sama7 family of SoCs

show more ...

Merge branch 'for-5.15-printk-index' into for-linus

Merge branch 'perf/urgent' into perf/core, to pick up fixes

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