linux-next: manual merge of the samsung tree with the tree

Hi Kukjin, Today's linux-next merge of the samsung tree got a conflict in arch/arm64/Kconfig between commit 419043609689 ("arm64: amd-seattle: Adding device tree for AMD Seattle platform") from the arm-soc tree and commit ab93f6ca6394 ("arm64: Enable ARMv8 based exynos7 SoC support") from the sams

RE: linux-next: manual merge of the samsung tree with the tree

Stephen Rothwell wrote: > > Hi Kukjin, > Hi Stephen, > Today's linux-next merge of the samsung tree got a conflict in > arch/arm/mach-exynos/exynos.c between commit 46bfc99c9225 ("ARM: l2c: > exynos: convert to generic l2c OF initialisation (and thereby fix it)") > from the arm tree and commit 3

linux-next: manual merge of the samsung tree with the tree

Hi Kukjin, Today's linux-next merge of the samsung tree got a conflict in arch/arm/mach-exynos/exynos.c between commit 46bfc99c9225 ("ARM: l2c: exynos: convert to generic l2c OF initialisation (and thereby fix it)") from the arm tree and commit 3919fb954b3a ("ARM: EXYNOS: Remove exynos_subsys regi