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

2020-10-13 Thread Stephen Rothwell
Hi all, On Tue, 8 Sep 2020 14:46:22 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the mmc tree got a conflict in: > > drivers/mmc/host/Kconfig > > between commits: > > cb6c03019cdd ("ARM: exynos: stop selecting PLAT_SAMSUNG") > db8230d29c3a ("ARM: s5pv210: don't imply

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

2020-09-08 Thread Krzysztof Kozlowski
On Tue, 8 Sep 2020 at 06:46, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the mmc tree got a conflict in: > > drivers/mmc/host/Kconfig > > between commits: > > cb6c03019cdd ("ARM: exynos: stop selecting PLAT_SAMSUNG") > db8230d29c3a ("ARM: s5pv210: don't imply

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

2020-09-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the mmc tree got a conflict in: drivers/mmc/host/Kconfig between commits: cb6c03019cdd ("ARM: exynos: stop selecting PLAT_SAMSUNG") db8230d29c3a ("ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG") from the samsung-krzk tree and commit: 54d8454436a2