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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm/configs/multi_v7_defconfig between various commits from the arm-soc tree and commit: 873edb2930ef ("ARM: multi_v7_defconfig: Update with current configuration") from the mvebu tree. I fixed it up (see below)

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm/configs/multi_v7_defconfig between various commits from the arm-soc tree and commit: 873edb2930ef ("ARM: multi_v7_defconfig: Update with current configuration") from the mvebu tree. I fixed it up (see below)

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

Hi Gregory, On Wed, 12 Apr 2017 10:23:07 +0200 Gregory CLEMENT wrote: > > How do you want to proceed with this conflict? > > Do you want that I merged arm-soc/next/arm64 in my mvebu/defconfig64 > branch before applying my patch ? > > Or do you prefer that I

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

Hi Gregory, On Wed, 12 Apr 2017 10:23:07 +0200 Gregory CLEMENT wrote: > > How do you want to proceed with this conflict? > > Do you want that I merged arm-soc/next/arm64 in my mvebu/defconfig64 > branch before applying my patch ? > > Or do you prefer that I continue to base my branch on

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

Hi Olof and Arnd, On mer., avril 12 2017, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > 3c9d36192802 ("arm64: set CONFIG_MMC_BCM2835=y in defconfig") > >

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

Hi Olof and Arnd, On mer., avril 12 2017, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in: > > arch/arm64/configs/defconfig > > between commit: > > 3c9d36192802 ("arm64: set CONFIG_MMC_BCM2835=y in defconfig") > > from the arm-soc tree

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm64/configs/defconfig between commit: 3c9d36192802 ("arm64: set CONFIG_MMC_BCM2835=y in defconfig") from the arm-soc tree and commit: 6ff829553345 ("arm64: configs: enable SDHCI driver for Xenon") from the

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm64/configs/defconfig between commit: 3c9d36192802 ("arm64: set CONFIG_MMC_BCM2835=y in defconfig") from the arm-soc tree and commit: 6ff829553345 ("arm64: configs: enable SDHCI driver for Xenon") from the

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm/configs/multi_v7_defconfig between commit: 6d54fb8a08a7 ("ARM: multi_v7_defconfig: Enable ST's HW Random Number Generator") from the arm-soc tree and commit: fe767240934f ("ARM: configs: Enabling the new

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm/configs/multi_v7_defconfig between commit: 6d54fb8a08a7 ("ARM: multi_v7_defconfig: Enable ST's HW Random Number Generator") from the arm-soc tree and commit: fe767240934f ("ARM: configs: Enabling the new

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

Hi all, Today's linux-next merge of the mvebu 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: e772ca05cceb ("arm64: defconfig: enable Armada 3700 related config")

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

Hi all, Today's linux-next merge of the mvebu 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: e772ca05cceb ("arm64: defconfig: enable Armada 3700 related config")

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

On Wednesday 02 December 2015 14:49:52 Gregory CLEMENT wrote: > > > least initially. The conflict will go away once it's tested sufficiently and > > I'm pulling it back. > > By the way, when you will pull our tree, we will still have it our own > mvebu/for-next branch. Will git managed to

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

Hi Arnd, On mer., déc. 02 2015, Arnd Bergmann wrote: > On Wednesday 02 December 2015 11:18:29 Mark Brown wrote: >> On Wed, Dec 02, 2015 at 11:12:44AM +, Mark Brown wrote: >> > Hi all, >> > >> > Today's linux-next merge of the mvebu tree got a conflict in between >> > commit >> >

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

On Wednesday 02 December 2015 11:18:29 Mark Brown wrote: > On Wed, Dec 02, 2015 at 11:12:44AM +, Mark Brown wrote: > > Hi all, > > > > Today's linux-next merge of the mvebu tree got a conflict in between commit > > 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc

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

On Wed, Dec 02, 2015 at 11:12:44AM +, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in between commit > 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc > tree and commit 5f4423af9dd17 ("ARM: orion: multiplatform

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in between commit 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc tree and commit 5f4423af9dd17 ("ARM: orion: multiplatform support") from the mvebu tree. I fixed it up (see below) and can carry the

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

On Wednesday 02 December 2015 14:49:52 Gregory CLEMENT wrote: > > > least initially. The conflict will go away once it's tested sufficiently and > > I'm pulling it back. > > By the way, when you will pull our tree, we will still have it our own > mvebu/for-next branch. Will git managed to

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

On Wed, Dec 02, 2015 at 11:12:44AM +, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in between commit > 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc > tree and commit 5f4423af9dd17 ("ARM: orion: multiplatform

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in between commit 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc tree and commit 5f4423af9dd17 ("ARM: orion: multiplatform support") from the mvebu tree. I fixed it up (see below) and can carry the

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

On Wednesday 02 December 2015 11:18:29 Mark Brown wrote: > On Wed, Dec 02, 2015 at 11:12:44AM +, Mark Brown wrote: > > Hi all, > > > > Today's linux-next merge of the mvebu tree got a conflict in between commit > > 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc

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

Hi Arnd, On mer., déc. 02 2015, Arnd Bergmann wrote: > On Wednesday 02 December 2015 11:18:29 Mark Brown wrote: >> On Wed, Dec 02, 2015 at 11:12:44AM +, Mark Brown wrote: >> > Hi all, >> > >> > Today's linux-next merge of the mvebu tree got a conflict in between >> >

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm/mach-mvebu/pmsu.c between commit: 9d2ea95a599a ("ARM: mvebu: add broken-idle option") from the arm-soc tree and commit: da6ee32a42c0 ("ARM: mvebu: add broken-idle option") from the mvebu tree. I fixed it

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm/mach-mvebu/pmsu.c between commit: 9d2ea95a599a ("ARM: mvebu: add broken-idle option") from the arm-soc tree and commit: da6ee32a42c0 ("ARM: mvebu: add broken-idle option") from the mvebu tree. I fixed it

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

On Tue, Jan 13, 2015 at 11:20:16AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in > arch/arm/boot/dts/Makefile between commit 6f1650f15bc4 ("ARM: dts: Only > build dtb if associated Arch and/or SoC is enabled") from the arm-soc > tree and

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/boot/dts/Makefile between commit 6f1650f15bc4 ("ARM: dts: Only build dtb if associated Arch and/or SoC is enabled") from the arm-soc tree and commit dd7d2be1d2b8 ("Kirkwood: add support for Seagate BlackArmor NAS220")

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/boot/dts/Makefile between commit 6f1650f15bc4 (ARM: dts: Only build dtb if associated Arch and/or SoC is enabled) from the arm-soc tree and commit dd7d2be1d2b8 (Kirkwood: add support for Seagate BlackArmor NAS220) from

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

On Tue, Jan 13, 2015 at 11:20:16AM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/boot/dts/Makefile between commit 6f1650f15bc4 (ARM: dts: Only build dtb if associated Arch and/or SoC is enabled) from the arm-soc tree and commit

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

On Mon, May 5, 2014 at 6:07 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in > arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu: > clean-up unneeded kconfig selects") from the arm-soc tree and commit > 8e6ac2033822 ("ARM:

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu: clean-up unneeded kconfig selects") from the arm-soc tree and commit 8e6ac2033822 ("ARM: mvebu: enable the ARM SCU on Armada 375 and Armada 38x") from the

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 (ARM: mvebu: clean-up unneeded kconfig selects) from the arm-soc tree and commit 8e6ac2033822 (ARM: mvebu: enable the ARM SCU on Armada 375 and Armada 38x) from the mvebu

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

On Mon, May 5, 2014 at 6:07 PM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 (ARM: mvebu: clean-up unneeded kconfig selects) from the arm-soc tree and commit

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f ("ARM: qcom: Split Qualcomm support into legacy and multiplatform") from the arm-soc tree and commits 97623e934388 ("Merge branch 'mvebu/dt' into for-next") and 54cab10f63f2

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f (ARM: qcom: Split Qualcomm support into legacy and multiplatform) from the arm-soc tree and commits 97623e934388 (Merge branch 'mvebu/dt' into for-next) and 54cab10f63f2

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f ("ARM: qcom: Split Qualcomm support into legacy and multiplatform") from the arm-soc tree and commit a02dd0271d01 ("ARM: mvebu: select dtbs from MACH_ARMADA_*") from the

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f (ARM: qcom: Split Qualcomm support into legacy and multiplatform) from the arm-soc tree and commit a02dd0271d01 (ARM: mvebu: select dtbs from MACH_ARMADA_*) from the mvebu

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

On Mon, Aug 19, 2013 at 02:09:00PM -0700, Olof Johansson wrote: > it's this commit: > > commit 89602312c5755c87a5ca6ba8ef6b0fce9d510951 > Merge: a0cec78 f23afe2 > Author: Jason Cooper > AuthorDate: Wed Aug 14 18:55:13 2013 + > Commit: Jason Cooper > CommitDate: Wed Aug 14 18:55:13

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

it's this commit: commit 89602312c5755c87a5ca6ba8ef6b0fce9d510951 Merge: a0cec78 f23afe2 Author: Jason Cooper AuthorDate: Wed Aug 14 18:55:13 2013 + Commit: Jason Cooper CommitDate: Wed Aug 14 18:55:13 2013 + Merge remote-tracking branch 'arm-soc/for-next' into

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

Hi Stephen, On Mon, Aug 19, 2013 at 04:05:37PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the mvebu tree got conflicts in various files > between merges and commits in the arm-soc tree and merges in the mvebu > tree. I'm afraid I'm a bit lost... > These merges/commits in the

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

Hi all, Today's linux-next merge of the mvebu tree got conflicts in various files between merges and commits in the arm-soc tree and merges in the mvebu tree. These merges/commits in the mvebu tree appear to be from a previous version of the arm-soc tree that the mvebu tree has been rebased

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

Hi all, Today's linux-next merge of the mvebu tree got conflicts in various files between merges and commits in the arm-soc tree and merges in the mvebu tree. These merges/commits in the mvebu tree appear to be from a previous version of the arm-soc tree that the mvebu tree has been rebased

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

Hi Stephen, On Mon, Aug 19, 2013 at 04:05:37PM +1000, Stephen Rothwell wrote: Today's linux-next merge of the mvebu tree got conflicts in various files between merges and commits in the arm-soc tree and merges in the mvebu tree. I'm afraid I'm a bit lost... These merges/commits in the mvebu

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

it's this commit: commit 89602312c5755c87a5ca6ba8ef6b0fce9d510951 Merge: a0cec78 f23afe2 Author: Jason Cooper ja...@lakedaemon.net AuthorDate: Wed Aug 14 18:55:13 2013 + Commit: Jason Cooper ja...@lakedaemon.net CommitDate: Wed Aug 14 18:55:13 2013 + Merge remote-tracking

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

On Mon, Aug 19, 2013 at 02:09:00PM -0700, Olof Johansson wrote: it's this commit: commit 89602312c5755c87a5ca6ba8ef6b0fce9d510951 Merge: a0cec78 f23afe2 Author: Jason Cooper ja...@lakedaemon.net AuthorDate: Wed Aug 14 18:55:13 2013 + Commit: Jason Cooper ja...@lakedaemon.net