mbox series

[GIT,PULL,3/4] ARM: defconfig updates

Message ID CAK8P3a3OPgCzLxzd=7Ng=jregKB0HycLLrfA4xYd7-4Te-kHMA@mail.gmail.com
State New
Headers show
Series ARM: SoC changes for v5.7 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git

Message

Arnd Bergmann April 3, 2020, 9:36 p.m. UTC 
The following changes since commit 98d54f81e36ba3bf92172791eba5ca5bd813989b:

  Linux 5.6-rc4 (2020-03-01 16:38:46 -0600)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
tags/arm-defconfig-5.7

for you to fetch changes up to a0705d3c042ad39fb9c5609612bb39ef4bedd284:

  Merge tag 'at91-5.7-defconfig' of
git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into
arm/config (2020-03-25 17:22:53 +0100)

----------------------------------------------------------------
ARM: defconfig updates

As usual, tons of new drivers and other options got merged and
are now enabled in the defconfig files, usually as loadable modules.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

----------------------------------------------------------------
Anson Huang (3):
      arm64: defconfig: Select CONFIG_PINCTRL_IMX8MP by default
      arm64: defconfig: add i.MX system controller thermal support
      arm64: defconfig: Enable CONFIG_IMX8MM_THERMAL as module

Arnd Bergmann (10):
      Merge tag 'renesas-arm64-defconfig-for-v5.7-tag1' of
git://git.kernel.org/.../geert/renesas-devel into arm/config
      Merge tag 'hisi-arm64-defconfig-for-5.7' of
git://github.com/hisilicon/linux-hisi into arm/config
      Merge tag 'arm-soc/for-5.7/defconfig' of
https://github.com/Broadcom/stblinux into arm/config
      Merge tag 'tegra-for-5.7-arm-defconfig' of
git://git.kernel.org/.../tegra/linux into arm/config
      Merge tag 'samsung-defconfig-5.7' of
git://git.kernel.org/.../krzk/linux into arm/config
      Merge tag 'qcom-arm64-defconfig-for-5.7' of
git://git.kernel.org/.../qcom/linux into arm/config
      Merge tag 'qcom-defconfig-for-5.7' of
git://git.kernel.org/.../qcom/linux into arm/config
      Merge tag 'imx-defconfig-5.7' of
git://git.kernel.org/.../shawnguo/linux into arm/config
      Merge tag 'omap-for-v5.7/defconfig-signed' of
git://git.kernel.org/.../tmlind/linux-omap into arm/config
      Merge tag 'at91-5.7-defconfig' of
git://git.kernel.org/.../at91/linux into arm/config

Bjorn Andersson (3):
      arm64: defconfig: Enable Qualcomm SDM845 display and gpu clocks
      arm64: defconfig: Enable Truly NT35597 WQXGA panel
      arm64: defconfig: Enable Qualcomm SDM845 audio configs

Brian Masney (1):
      ARM: qcom_defconfig: add Broadcom bluetooth options

Christian Gmeiner (1):
      ARM: multi_v7_defconfig: enable drm imx support

Dmitry Osipenko (2):
      ARM: multi_v7_defconfig: Enable Tegra cpuidle driver
      ARM: tegra: Enable Tegra cpuidle driver in tegra_defconfig

Eugen Hristev (1):
      ARM: configs: at91: enable sama5d4 compatible watchdog

Florian Fainelli (1):
      Merge tag 'tags/bcm2835-defconfig-next-2020-03-09' into defconfig/next

Geert Uytterhoeven (1):
      arm64: defconfig: Enable additional support for Renesas platforms

Hou Zhiqiang (1):
      arm64: defconfig: Enable CONFIG_PCIE_LAYERSCAPE_GEN4

John Garry (1):
      arm64: defconfig: Enable MEGARAID_SAS

Li Yang (15):
      arm64: defconfig: run through savedefconfig for ordering
      arm64: defconfig: Enable NXP flexcan driver
      arm64: defconfig: Enable QorIQ DPAA1 drivers
      arm64: defconfig: Enable QorIQ DPAA2 drivers
      arm64: defconfig: Enable ENETC Ethernet controller and FELIX switch
      arm64: defconfig: Enable NXP/FSL SPI controller drivers
      arm64: defconfig: Enable QorIQ cpufreq driver
      arm64: defconfig: Enable ARM SBSA watchdog driver
      arm64: defconfig: Enable QorIQ IFC NAND controller driver
      arm64: defconfig: Enable QorIQ GPIO driver
      arm64: defconfig: Enable ARM Mali display driver
      arm64: defconfig: Enable flash device drivers for QorIQ boards
      arm64: defconfig: Enable RTC devices for QorIQ boards
      arm64: defconfig: Enable PHY devices used on QorIQ boards
      arm64: defconfig: Enable e1000 device

Luca Weiss (1):
      ARM: qcom_defconfig: Enable QRTR

Lukasz Luba (1):
      ARM: exynos_defconfig: Enable SCHED_MC and ENERGY_MODEL

Marek Szyprowski (3):
      ARM: exynos_defconfig: Enable SquashFS and increase RAM block device size
      ARM: exynos_defconfig: Add more drivers for GalaxyS3/Trats2
      ARM: bcm2835_defconfig: add support for Raspberry Pi4

Oleksandr Suvorov (2):
      ARM: imx_v6_v7_defconfig: Enable TOUCHSCREEN_ATMEL_MXT
      ARM: imx_v6_v7_defconfig: Enable TOUCHSCREEN_AD7879

Sricharan R (1):
      arm64: defconfig: Enable qcom ipq6018 clock and pinctrl

Stephan Gerhold (1):
      arm64: defconfig: Enable Qualcomm PM8XXX vibrator support

Tony Lindgren (7):
      ARM: omap2plus_defconfig: Enable ext4 security for setcap
      ARM: omap2plus_defconfig: Enable simple-pm-bus
      ARM: omap2plus_defconfig: Enable zram as loadable modules
      ARM: omap2plus_defconfig: Enable more droid4 devices as loadable modules
      ARM: omap2plus_defconfig: Enable McPDM optional PMIC clock as modules
      ARM: omap2plus_defconfig: Enable ina2xx_adc as a loadable module
      ARM: omap2plus_defconfig: Update for moved and dropped options

 arch/arm/configs/at91_dt_defconfig   |   1 +
 arch/arm/configs/bcm2835_defconfig   |   5 ++
 arch/arm/configs/exynos_defconfig    |  11 +++-
 arch/arm/configs/imx_v6_v7_defconfig |   3 ++
 arch/arm/configs/multi_v7_defconfig  |   7 +++
 arch/arm/configs/omap2plus_defconfig |  18 +++++--
 arch/arm/configs/qcom_defconfig      |   6 +++
 arch/arm/configs/tegra_defconfig     |   1 +
 arch/arm64/configs/defconfig         | 100 +++++++++++++++++++++++++++++++----
 9 files changed, 136 insertions(+), 16 deletions(-)

Comments

Linus Torvalds April 3, 2020, 10:17 p.m. UTC | #1 
On Fri, Apr 3, 2020 at 2:36 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
> tags/arm-defconfig-5.7

This caused a conflict in 'omap2plus_defconfig'.

I resolved it, but honestly, I couldn't find it in myself to care that
deeply about a defconfig conflict.

So I think somebody might want to check it and maybe re-generate that
thing if it matter.

                 Linus
pr-tracker-bot@kernel.org April 3, 2020, 10:30 p.m. UTC | #2 
The pull request you sent on Fri, 3 Apr 2020 23:36:22 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/arm-defconfig-5.7

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9b48c8f132e0c30220ce509f72dd90da05245524

Thank you!