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

Hi all, On Mon, 15 Feb 2021 09:14:44 +1100 Stephen Rothwell wrote: > > On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the arm-soc tree got a conflict in: > > > > arch/arm/Kconfig.debug > > > > between commits: > > > > 9ca4efec0aba ("ARM:

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

Hi Alain, On Sat, 20 Feb 2021 20:45:25 +0100 Alain Volmat wrote: > > sorry for the delay, is there anything I should do concerning this issue > ? No, it should be taken care of my the maintainers when they get Linus to merge their trees. -- Cheers, Stephen Rothwell pgp6n6zDuD5bG.pgp

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

Hi Stephen, sorry for the delay, is there anything I should do concerning this issue ? Cheers, Alain On Mon, Feb 15, 2021 at 09:14:44AM +1100, Stephen Rothwell wrote: > Hi all, > > On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the arm-soc

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

Hi all, On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/Kconfig.debug > > between commits: > > 9ca4efec0aba ("ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti > LL_UART") >

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/Kconfig.debug between commits: 9ca4efec0aba ("ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART") 6e959ad8bb90 ("ARM: 9041/1: sti LL_UART: add STiH418 SBC UART0 support") from the arm

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

On Fri, Aug 30, 2019 at 1:27 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/mach-iop13xx/pci.c > > between commit: > > 4af014984273 ("ARM: 8871/1: iop13xx: Simplify iop13xx_atu{e,x}_pci_status > checks") > > from the

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/mach-iop13xx/pci.c between commit: 4af014984273 ("ARM: 8871/1: iop13xx: Simplify iop13xx_atu{e,x}_pci_status checks") from the arm tree and commit: 59d3ae9a5bf6 ("ARM: remove Intel iop33x and iop13xx

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/include/asm/cputype.h between commit: 1067a8130b17 ("ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs") from the arm tree and commits: 9e35ddc962a6 ("ARM: add Broadcom Brahma-B53 main ID

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/include/asm/cputype.h between commit: 1067a8130b17 ("ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs") from the arm tree and commits: 9e35ddc962a6 ("ARM: add Broadcom Brahma-B53 main ID

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/include/asm/cputype.h between commit: b2ccaa851e9882c10 ("ARM: add CPU part numbers for Cortex A73, A75 and Brahma B15") from the arm tree and several commits from the arm-soc tree: 842fa17d6c95368d7

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/include/asm/cputype.h between commit: b2ccaa851e9882c10 ("ARM: add CPU part numbers for Cortex A73, A75 and Brahma B15") from the arm tree and several commits from the arm-soc tree: 842fa17d6c95368d7

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

On 01/17/2017 02:49 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/mach-ux500/platsmp.c > > between commit: > > 6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with > __pa_symbol") > > from the arm

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

On 01/17/2017 02:49 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/mach-ux500/platsmp.c > > between commit: > > 6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with > __pa_symbol") > > from the arm

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/mach-ux500/platsmp.c between commit: 6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol") from the arm tree and commit: 9e634cae7256 ("ARM: ux500: simplify secondary

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/mach-ux500/platsmp.c between commit: 6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol") from the arm tree and commit: 9e634cae7256 ("ARM: ux500: simplify secondary

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

Hi Russell, On Wed, 12 Aug 2015 09:48:34 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/kernel/psci.c > > between commit: > > be120397e770 ("ARM: migrate to common PSCI client code") > > from the arm tree and commit: > >

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

Hi Russell, On Wed, 12 Aug 2015 09:48:34 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/kernel/psci.c > > between commit: > > be120397e770 ("ARM: migrate to common PSCI client code") > > from the arm

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

On Wed, 12 Aug 2015, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/kernel/psci.c > > between commit: > > be120397e770 ("ARM: migrate to common PSCI client code") > > from the arm tree and commit: > > 19c233b79d1a

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/kernel/psci.c between commit: be120397e770 ("ARM: migrate to common PSCI client code") from the arm tree and commit: 19c233b79d1a ("ARM: appropriate __init annotation for const data") from the arm-soc

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

On Wed, 12 Aug 2015, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/kernel/psci.c between commit: be120397e770 (ARM: migrate to common PSCI client code) from the arm tree and commit: 19c233b79d1a (ARM: appropriate

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/kernel/psci.c between commit: be120397e770 (ARM: migrate to common PSCI client code) from the arm tree and commit: 19c233b79d1a (ARM: appropriate __init annotation for const data) from the arm-soc tree.

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-socfpga/core.h between commit 02b4e2756e01 ("ARM: v7 setup function should invalidate L1 cache") from the arm tree and commit 122694a0c712 ("ARM: socfpga: use of_iomap to map the SCU") from the arm-soc tree. I

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-socfpga/core.h between commit 02b4e2756e01 (ARM: v7 setup function should invalidate L1 cache) from the arm tree and commit 122694a0c712 (ARM: socfpga: use of_iomap to map the SCU) from the arm-soc tree. I fixed

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

On Fri, Jan 30, 2015 at 09:55:33AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/Kconfig.debug between commit 4d31e6641295 ("ARM: 8272/1: netx: > Migrate DEBUG_LL macros to shared directory") from the tree and > commits

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commit 4d31e6641295 ("ARM: 8272/1: netx: Migrate DEBUG_LL macros to shared directory") from the tree and commits 01ea63d99397 ("ARM: sirf: add two debug ports for CSRatlas7 SoC") and

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commit 4d31e6641295 (ARM: 8272/1: netx: Migrate DEBUG_LL macros to shared directory) from the tree and commits 01ea63d99397 (ARM: sirf: add two debug ports for CSRatlas7 SoC) and e23814da8262

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

On Fri, Jan 30, 2015 at 09:55:33AM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commit 4d31e6641295 (ARM: 8272/1: netx: Migrate DEBUG_LL macros to shared directory) from the tree and commits

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

On Fri, Sep 26, 2014 at 10:27:49AM +0100, Daniel Thompson wrote: > On 26/09/14 09:18, Russell King - ARM Linux wrote: > > On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote: > >> Hi all, > >> > >> Today's linux-next merge of the arm-soc tree got a conflict in > >>

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

On 26/09/14 09:18, Russell King - ARM Linux wrote: > On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> arch/arm/Kconfig.debug between commits 0889a9e35bd3 ("ARM: 8142/1: >> ks8695: Migrate debug_ll

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

Hi Carlo, On Fri, 26 Sep 2014 10:19:43 +0200 Carlo Caione wrote: > > Am I going blind or these two lines are missing from d8a00916b303 > > + default 0xc81004c0 if DEBUG_MESON_UARTAO > ... > + default 0xf31004c0 if DEBUG_MESON_UARTAO They are in the final version of

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

On Fri, Sep 26, 2014 at 3:23 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/Kconfig.debug between commits 0889a9e35bd3 ("ARM: 8142/1: > ks8695: Migrate debug_ll macros to shared directory"), e38c399ca584 > ("ARM: 8144/2: netx:

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

On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/Kconfig.debug between commits 0889a9e35bd3 ("ARM: 8142/1: > ks8695: Migrate debug_ll macros to shared directory"), e38c399ca584 > ("ARM:

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

On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commits 0889a9e35bd3 (ARM: 8142/1: ks8695: Migrate debug_ll macros to shared directory), e38c399ca584 (ARM: 8144/2: netx:

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

On Fri, Sep 26, 2014 at 3:23 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commits 0889a9e35bd3 (ARM: 8142/1: ks8695: Migrate debug_ll macros to shared directory), e38c399ca584 (ARM:

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

Hi Carlo, On Fri, 26 Sep 2014 10:19:43 +0200 Carlo Caione ca...@caione.org wrote: Am I going blind or these two lines are missing from d8a00916b303 + default 0xc81004c0 if DEBUG_MESON_UARTAO ... + default 0xf31004c0 if DEBUG_MESON_UARTAO They are in the final version of

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

On 26/09/14 09:18, Russell King - ARM Linux wrote: On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commits 0889a9e35bd3 (ARM: 8142/1: ks8695: Migrate debug_ll macros to

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

On Fri, Sep 26, 2014 at 10:27:49AM +0100, Daniel Thompson wrote: On 26/09/14 09:18, Russell King - ARM Linux wrote: On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commits 0889a9e35bd3 ("ARM: 8142/1: ks8695: Migrate debug_ll macros to shared directory"), e38c399ca584 ("ARM: 8144/2: netx: Migrate DEBUG_LL macros to shared directory"), 6741cacfa3f1 ("ARM:

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commits 0889a9e35bd3 (ARM: 8142/1: ks8695: Migrate debug_ll macros to shared directory), e38c399ca584 (ARM: 8144/2: netx: Migrate DEBUG_LL macros to shared directory), 6741cacfa3f1 (ARM: 8145/1:

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-integrator/include/mach/memory.h between commit 3ae4e9812941 ("ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from ") from the arm tree and commit e6dc195c1c69 ("ARM: integrator: get rid of ") from

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-integrator/include/mach/memory.h between commit 3ae4e9812941 (ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from mach/memory.h) from the arm tree and commit e6dc195c1c69 (ARM: integrator: get rid

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

On Sun, Jun 1, 2014 at 5:49 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-exynos/exynos.c between commits dfbdd3d55403 ("ARM: l2c: > exynos: remove cache size override"), 25a9ef63cd2b ("ARM: l2c: exynos: > convert to

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos/exynos.c between commits dfbdd3d55403 ("ARM: l2c: exynos: remove cache size override"), 25a9ef63cd2b ("ARM: l2c: exynos: convert to common l2c310 early resume functionality") and 15b0bc4041ba ("ARM: l2c:

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos/exynos.c between commits dfbdd3d55403 (ARM: l2c: exynos: remove cache size override), 25a9ef63cd2b (ARM: l2c: exynos: convert to common l2c310 early resume functionality) and 15b0bc4041ba (ARM: l2c:

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

On Sun, Jun 1, 2014 at 5:49 PM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos/exynos.c between commits dfbdd3d55403 (ARM: l2c: exynos: remove cache size override), 25a9ef63cd2b (ARM: l2c: exynos:

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-zynq/common.c between commit e1e4ccb5b1b6 ("ARM: l2c: zynq: convert to generic l2c OF initialisation") from the arm tree and commit 00f7dc636366 ("ARM: zynq: Add support for SOC_BUS") from the arm-soc tree. I

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-rockchip/rockchip.c between commit fc2553457ccd ("ARM: l2c: rockchip: convert to generic l2c OF initialisation") from the arm tree and commit 26ab69cb4c1f ("ARM: rockchip: convert smp bringup to

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-rockchip/rockchip.c between commit fc2553457ccd (ARM: l2c: rockchip: convert to generic l2c OF initialisation) from the arm tree and commit 26ab69cb4c1f (ARM: rockchip: convert smp bringup to

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-zynq/common.c between commit e1e4ccb5b1b6 (ARM: l2c: zynq: convert to generic l2c OF initialisation) from the arm tree and commit 00f7dc636366 (ARM: zynq: Add support for SOC_BUS) from the arm-soc tree. I fixed

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

Hi Stephen, On 23/05/2014 02:45, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-mvebu/board-v7.c between commit 8ae2473d96f1 ("ARM: l2c: > mvebu: convert to generic l2c OF initialisation") from the arm tree and > commit

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

Hi Stephen, On 23/05/2014 02:45, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-mvebu/board-v7.c between commit 8ae2473d96f1 (ARM: l2c: mvebu: convert to generic l2c OF initialisation) from the arm tree and commit 5686a1e5aa43

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-vexpress/v2m.c between commit 86cb8830d957 ("ARM: l2c: vexpress: convert to generic l2c OF initialisation") from the arm tree and commits 3b9334ac835b ("mfd: vexpress: Convert custom func API to regmap") and

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-mvebu/board-v7.c between commit 8ae2473d96f1 ("ARM: l2c: mvebu: convert to generic l2c OF initialisation") from the arm tree and commit 5686a1e5aa43 ("bus: mvebu: pass the coherency availability information at

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-mvebu/board-v7.c between commit 8ae2473d96f1 (ARM: l2c: mvebu: convert to generic l2c OF initialisation) from the arm tree and commit 5686a1e5aa43 (bus: mvebu: pass the coherency availability information at init

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-vexpress/v2m.c between commit 86cb8830d957 (ARM: l2c: vexpress: convert to generic l2c OF initialisation) from the arm tree and commits 3b9334ac835b (mfd: vexpress: Convert custom func API to regmap) and

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commit 753d12434da3 ("ARM: 7932/1: bcm: Add DEBUG_LL console support") from the arm tree and commit caad0b41de69 ("ARM: add Marvell Berlin UART0 lowlevel debug") from the arm-soc tree. I fixed

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/Kconfig.debug between commit 753d12434da3 (ARM: 7932/1: bcm: Add DEBUG_LL console support) from the arm tree and commit caad0b41de69 (ARM: add Marvell Berlin UART0 lowlevel debug) from the arm-soc tree. I fixed it up

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/include/debug/highbank.S between commits df917c8c18b4 ("ARM: debug: provide PL01x debug uart phys/virt address configuration options") and 5e33abe38413 ("ARM: debug: move PL01X debug include into

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/include/debug/highbank.S between commits df917c8c18b4 (ARM: debug: provide PL01x debug uart phys/virt address configuration options) and 5e33abe38413 (ARM: debug: move PL01X debug include into arch/arm/include/debug/)

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-tegra/hotplug.c between commit da2265b130f6 ("ARM: tegra: remove tegra specific cpu_disable()") from the arm tree and commit 7469688e832e ("ARM: tegra: Unify tegra{20,30,114}_init_early()") from the arm-soc tree.

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-tegra/hotplug.c between commit da2265b130f6 (ARM: tegra: remove tegra specific cpu_disable()) from the arm tree and commit 7469688e832e (ARM: tegra: Unify tegra{20,30,114}_init_early()) from the arm-soc tree. I

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

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/26/2012 11:31 AM, Stephen Rothwell : > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/tty/serial/atmel_serial.c between commit 95e629b761ce > ("ARM/AVR32: get rid of serial_at91.h") from the arm tree and

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/tty/serial/atmel_serial.c between commit 95e629b761ce ("ARM/AVR32: get rid of serial_at91.h") from the arm tree and commit bcd2360c1ff9 ("arm: at91: move platfarm_data to include/linux/platform_data/atmel.h") from the

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/tty/serial/atmel_serial.c between commit 95e629b761ce (ARM/AVR32: get rid of serial_at91.h) from the arm tree and commit bcd2360c1ff9 (arm: at91: move platfarm_data to include/linux/platform_data/atmel.h) from the

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

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 11/26/2012 11:31 AM, Stephen Rothwell : Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/tty/serial/atmel_serial.c between commit 95e629b761ce (ARM/AVR32: get rid of serial_at91.h) from the arm tree and commit

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/include/asm/timex.h between commit 56942fec06ef ("ARM: 7538/1: delay: add registration mechanism for delay timer sources") from the arm tree and commit 387798b37c8d ("ARM: initial multiplatform support") from the

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/include/asm/timex.h between commit 56942fec06ef (ARM: 7538/1: delay: add registration mechanism for delay timer sources) from the arm tree and commit 387798b37c8d (ARM: initial multiplatform support) from the arm-soc

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

On Thu, Sep 20, 2012 at 8:03 AM, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-integrator/integrator_cp.c between commit 73efd53012af > ("ARM: 7519/1: integrator: convert platform devices to Device Tree") from > the arm tree and commit

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-integrator/integrator_cp.c between commit 73efd53012af ("ARM: 7519/1: integrator: convert platform devices to Device Tree") from the arm tree and commit b7a3f8db07c1 ("ARM: integrator: use __iomem pointers for

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

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-integrator/integrator_cp.c between commit 73efd53012af (ARM: 7519/1: integrator: convert platform devices to Device Tree) from the arm tree and commit b7a3f8db07c1 (ARM: integrator: use __iomem pointers for MMIO)

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

On Thu, Sep 20, 2012 at 8:03 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-integrator/integrator_cp.c between commit 73efd53012af (ARM: 7519/1: integrator: convert platform devices to Device Tree) from the arm