linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2019-06-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm/mach-exynos/Makefile between commit: 3fe1ee40b2a2 ("ARM: use arch_extension directive instead of arch argument") from the arm-soc tree and commit: 24d2c73ff28b ("ARM: exynos: Only build MCPM support if

linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2019-06-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm/configs/s3c6400_defconfig between commit: 6c48edcc955a ("ARM: configs: Remove useless UEVENT_HELPER_PATH") from the arm-soc tree and commit: 5a96019ce5cd ("ARM: defconfig: samsung: Cleanup with savedef

Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2019-06-24 Thread Stephen Rothwell
Hi all, On Tue, 25 Jun 2019 09:59:06 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the samsung-krzk tree got a conflict in: > > arch/arm/configs/s3c6400_defconfig > > between commit: > > 6c48edcc955a ("ARM: configs: Remove useless UEVENT_HELPER_PATH") > > from the arm-soc

Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2016-09-16 Thread Krzysztof Kozlowski
On 09/05/2016 03:19 AM, Stephen Rothwell wrote: > Hi Krzysztof, > > Today's linux-next merge of the samsung-krzk tree got a conflict in: > > arch/arm64/boot/dts/exynos/exynos7.dtsi > > between commit: > > 585dcacac6bb ("arm64: dts: Fix broken architected timer interrupt trigger") > > from

linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2016-09-04 Thread Stephen Rothwell
Hi Krzysztof, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm64/boot/dts/exynos/exynos7.dtsi between commit: 585dcacac6bb ("arm64: dts: Fix broken architected timer interrupt trigger") from the arm-soc tree and commit: 36d1c9cd07cd ("arm64: dts: exynos: Use

linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2016-06-05 Thread Stephen Rothwell
Hi Krzysztof, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm/mach-exynos/Kconfig between commit: 5c34a4e89c74 ("ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB") from the arm-soc tree and commit: 9479f7cc9187 ("soc: samsung: pm_domains: Enable COMPI

Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2016-03-01 Thread Krzysztof Kozlowski
On 02.03.2016 07:14, Stephen Rothwell wrote: > Hi Krzysztof, > > Today's linux-next merge of the samsung-krzk tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > efdda175c07f ("arm64: defconfig: add spmi and usb related configs") > > from the arm-soc tree and c

linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

2016-03-01 Thread Stephen Rothwell
Hi Krzysztof, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm64/configs/defconfig between commit: efdda175c07f ("arm64: defconfig: add spmi and usb related configs") from the arm-soc tree and commit: 617fe7196d54 ("arm64: defconfig: Enable exynos thermal co