| Message ID | 20190625193451.7696-1-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Queued, archived |
| Commit | dd50a69b5697532666023766688c6ea642e5a443 |
| Headers | show |
| Series | [GIT,PULL,1/4] ARM: defconfig: Samsung/Exynos for v5.3 | expand |
On Tue, 25 Jun 2019 at 21:35, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: > > Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-5.3 > > for you to fetch changes up to dd50a69b5697532666023766688c6ea642e5a443: > > ARM: exynos_defconfig: Enable Panfrost and Lima drivers (2019-06-19 19:23:35 +0200) > > ---------------------------------------------------------------- > Samsung defconfig changes for v5.3 > > 1. Trim several configs with savedefconfig. > 2. Enable Lima and Panfrost drivers for Mali GPU. Hi, I forgot to mention possible merge conflicts (although Stephen Cc-ed you on mails). Resolution is to accept both sides: --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@@ -4,12 -5,7 +5,8 @@@ CONFIG_PREEMPT= CONFIG_CGROUPS=y CONFIG_BLK_DEV_INITRD=y CONFIG_PERF_EVENTS=y - CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_EXYNOS=y - CONFIG_ARCH_EXYNOS3=y +CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@@ -181,10 -178,11 +178,10 @@@ CONFIG_CFG80211= CONFIG_MAC80211=m CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y + CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y - CONFIG_MTD_CMDLINE_PARTS=y --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig @@@ -18,9 -15,12 +15,11 @@@ CONFIG_MACH_HMT= CONFIG_MACH_SMARTQ5=y CONFIG_MACH_SMARTQ7=y CONFIG_MACH_WLF_CRAGG_6410=y - CONFIG_AEABI=y CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144" CONFIG_VFP=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" + CONFIG_MODULES=y + CONFIG_MODULE_UNLOAD=y + # CONFIG_BLK_DEV_BSG is not set Best regards, Krzysztof
On Tue, Jun 25, 2019 at 09:34:48PM +0200, Krzysztof Kozlowski wrote: > The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: > > Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-5.3 > > for you to fetch changes up to dd50a69b5697532666023766688c6ea642e5a443: > > ARM: exynos_defconfig: Enable Panfrost and Lima drivers (2019-06-19 19:23:35 +0200) > > ---------------------------------------------------------------- > Samsung defconfig changes for v5.3 > > 1. Trim several configs with savedefconfig. > 2. Enable Lima and Panfrost drivers for Mali GPU. > > ---------------------------------------------------------------- > Krzysztof Kozlowski (4): > ARM: exynos_defconfig: Trim and reorganize with savedefconfig > ARM: defconfig: samsung: Cleanup with savedefconfig > ARM: multi_v7_defconfig: Enable Panfrost and Lima drivers > ARM: exynos_defconfig: Enable Panfrost and Lima drivers Merged, thanks! -Olof
On Wed, Jun 26, 2019 at 11:14:04AM +0200, Krzysztof Kozlowski wrote: > On Tue, 25 Jun 2019 at 21:35, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > > > The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: > > > > Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) > > > > are available in the Git repository at: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-5.3 > > > > for you to fetch changes up to dd50a69b5697532666023766688c6ea642e5a443: > > > > ARM: exynos_defconfig: Enable Panfrost and Lima drivers (2019-06-19 19:23:35 +0200) > > > > ---------------------------------------------------------------- > > Samsung defconfig changes for v5.3 > > > > 1. Trim several configs with savedefconfig. > > 2. Enable Lima and Panfrost drivers for Mali GPU. > > Hi, > > I forgot to mention possible merge conflicts (although Stephen Cc-ed > you on mails). Resolution is to accept both sides: > Some of this could have been avoided by basing your branch on our fixes, but not a big deal in this case. Thanks for the heads up! -Olof
The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-defconfig-5.3 for you to fetch changes up to dd50a69b5697532666023766688c6ea642e5a443: ARM: exynos_defconfig: Enable Panfrost and Lima drivers (2019-06-19 19:23:35 +0200) ---------------------------------------------------------------- Samsung defconfig changes for v5.3 1. Trim several configs with savedefconfig. 2. Enable Lima and Panfrost drivers for Mali GPU. ---------------------------------------------------------------- Krzysztof Kozlowski (4): ARM: exynos_defconfig: Trim and reorganize with savedefconfig ARM: defconfig: samsung: Cleanup with savedefconfig ARM: multi_v7_defconfig: Enable Panfrost and Lima drivers ARM: exynos_defconfig: Enable Panfrost and Lima drivers arch/arm/configs/exynos_defconfig | 65 +++++++++++++++++-------------------- arch/arm/configs/mini2440_defconfig | 43 ++++++++++-------------- arch/arm/configs/multi_v7_defconfig | 3 +- arch/arm/configs/s3c2410_defconfig | 24 +++++--------- arch/arm/configs/s3c6400_defconfig | 11 +++---- 5 files changed, 62 insertions(+), 84 deletions(-)