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) an

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 v4.11-

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 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/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 mve

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 Mar

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 automag

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 >> > 377524d

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 support"

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 fi

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 up

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") fr

linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in drivers/cpuidle/cpuidle-armada-370-xp.c between commit dc559aabe2d4 ("cpuidle: mvebu: Fix the name of the states") from Linus' tree and commit 742450174037 ("cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7") from

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/headsmp-a9.S between commit e77a0969a99e ("ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree and commit 435b4642e49f ("ARM: mvebu: use the common function for Armada 375 SMP workaroun

linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/Kconfig between commit 19682f72f5db ("ARM: Remove ARCH_HAS_CPUFREQ config option") from Linus' tree and commit ba364fc752da ("ARM: Kirkwood: Remove mach-kirkwood") from the mvebu tree. I fixed it up (The latter just rem

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

On Mon, Jul 07, 2014 at 11:28:53AM +1000, Stephen Rothwell wrote: > diff --cc arch/arm/mach-mvebu/headsmp-a9.S > index 7c91ddb6f1f7,da5bb292b91c.. > --- a/arch/arm/mach-mvebu/headsmp-a9.S > +++ b/arch/arm/mach-mvebu/headsmp-a9.S > @@@ -14,8 -14,9 +14,10 @@@ > > #include > #inclu

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/headsmp-a9.S between commit 8a3a9dd50dd9 ("ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+") from the arm tree and commit 0e2be4c1121a ("ARM: mvebu: fix SMP boot for Armada 38x and Armada 375 Z1 in big

Re: linux-next: manual merge of the mvebu tree with Linus' tree

On Mon, Jun 23, 2014 at 10:57:41AM +1000, 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 21278aeafbfa ("ARM: use > menuconfig for sub-arch menus") from Linus' tree and commit > 55fc83023212 ("ARM: Kirk

linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/Kconfig between commit 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") from Linus' tree and commit 55fc83023212 ("ARM: Kirkwood: Add setup file for netxbig LEDs") from the mvebu tree. I fixed it up (s

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: mv

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 mveb

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

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/mach-mvebu/board-v7.c between commit b21770945fa2 ("ARM: l2c: remove unnecessary UL-suffix to mask values") from the arm tree and commit 2865b82e9e19 ("ARM: mvebu: remove unnecessary ifdef around l2x0_of_init") 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 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 mveb

linux-next: manual merge of the mvebu tree with Linus' tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in Documentation/devicetree/bindings/vendor-prefixes.txt between commit d5f93b8ad01e ("of: Update qcom vendor prefix description") from Linus' tree and commit f7f2ea9f49b0 ("DT: Vendor prefixes: Add ricoh, qnap, sii and synology") f

Re: linux-next: manual merge of the mvebu tree

On Thu, Oct 10, 2013 at 12:57:03PM +0200, Thierry Reding wrote: > On Wed, Oct 09, 2013 at 10:37:27AM -0400, Jason Cooper wrote: > > Thierry, > > > > On Wed, Oct 09, 2013 at 04:14:27PM +0200, Thierry Reding wrote: > > > Today's linux-next merge of the mvebu tree got conflicts in > > > > I looked i

Re: linux-next: manual merge of the mvebu tree

On Wed, Oct 09, 2013 at 10:37:27AM -0400, Jason Cooper wrote: > Thierry, > > On Wed, Oct 09, 2013 at 04:14:27PM +0200, Thierry Reding wrote: > > Today's linux-next merge of the mvebu tree got conflicts in > > I looked in your scripts repo, and couldn't find the script you use to > send out this e

Re: linux-next: manual merge of the mvebu tree

Thierry, On Wed, Oct 09, 2013 at 04:14:27PM +0200, Thierry Reding wrote: > Today's linux-next merge of the mvebu tree got conflicts in I looked in your scripts repo, and couldn't find the script you use to send out this email thread :( Since I can't create a patch, I'll just ask, could you inclu

Re: linux-next: manual merge of the mvebu tree

On Wed, Oct 09, 2013 at 04:14:27PM +0200, Thierry Reding wrote: > Today's linux-next merge of the mvebu tree got conflicts in > > arch/arm/mach-dove/board-dt.c > arch/arm/mach-kirkwood/board-dt.c > > caused by commits ebd7d3a (ARM: kirkwood: retain MAC address for DT > ethernet), 511a

linux-next: manual merge of the mvebu tree

Today's linux-next merge of the mvebu tree got conflicts in arch/arm/mach-dove/board-dt.c arch/arm/mach-kirkwood/board-dt.c caused by commits ebd7d3a (ARM: kirkwood: retain MAC address for DT ethernet), 511aaab (ARM: kirkwood: Remove unneeded MBus initialization) and a169e3a (ARM:

Re: manual merge of the mvebu tree

On Tue, Oct 08, 2013 at 03:44:13PM +0200, Thierry Reding wrote: > Today's linux-next merge of the mvebu tree got conflicts in: > > arch/arm/mach-dove/board-dt.c > > caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init), > e3730b4 (ARM: dove: switch to DT probed mbus addre

manual merge of the mvebu tree

Today's linux-next merge of the mvebu tree got conflicts in: arch/arm/mach-dove/board-dt.c caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init), e3730b4 (ARM: dove: switch to DT probed mbus address windows), and 51e40f5 (ARM: dove: remove custom .init_time hook). I fi

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 20

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 mvebu/drivers

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 mv

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 upon.

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

Dear Stephen Rothwell, On Wed, 14 Aug 2013 16:18:40 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in > drivers/pci/host/Kconfig between commit 5477a33b51b7 ("PCI: mvebu: Make > Marvell PCIe driver depend on OF") from the pci tree and commit

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

Stephen, On Wed, Aug 14, 2013 at 04:22:33PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in > drivers/pci/host/pci-mvebu.c between commit f48fbf9c7e89 ("PCI: mvebu: > Convert to use devm_ioremap_resource") from the pci tree and commit > 82

linux-next: manual merge of the mvebu tree with the pci tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in drivers/pci/host/pci-mvebu.c between commit f48fbf9c7e89 ("PCI: mvebu: Convert to use devm_ioremap_resource") from the pci tree and commit 826727641b2a ("PCI: mvebu: move clock enable before register access") from the mvebu tree.

linux-next: manual merge of the mvebu tree with the pci tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in drivers/pci/host/Kconfig between commit 5477a33b51b7 ("PCI: mvebu: Make Marvell PCIe driver depend on OF") from the pci tree and commit 31d896ade95d ("PCI: mvebu: add support for Marvell Dove SoCs") from the mvebu tree. I fixed

linux-next: manual merge of the mvebu tree with the i2c tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt between commit f480adaf1b71 ("i2c: mv64xxx: Document the newly introduced allwinner compatible") from the i2c tree and commit e7c4a1e9f937 ("ARM: dts: mvebu: Introduce a new c

Re: linux-next: manual merge of the mvebu tree with the imx-mxs tree

On Thu, Jun 06, 2013 at 03:36:00PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in > arch/arm/Kconfig.debug between commit 284166ffebc3 ("ARM: imx: enable > low-level debug support for imx6sl") from the imx-mxs tree and commit > 5be22d8c29f

linux-next: manual merge of the mvebu tree with the imx-mxs tree

Hi all, Today's linux-next merge of the mvebu tree got a conflict in arch/arm/Kconfig.debug between commit 284166ffebc3 ("ARM: imx: enable low-level debug support for imx6sl") from the imx-mxs tree and commit 5be22d8c29fd ("arm: mvebu: add another earlyprintk Kconfig option") from the mvebu tree.