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: 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 tree and commits:
> >
> > f3a732843acc ("ARM: remove sirf prima2/atlas platforms")
> > 89d4f98ae90d ("ARM: remove zte zx platform")
> >
> > from the arm-soc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > diff --cc arch/arm/Kconfig.debug
> > index 7a8697a97c98,c36c5d4c6e9c..
> > --- a/arch/arm/Kconfig.debug
> > +++ b/arch/arm/Kconfig.debug
> > @@@ -1623,10 -1546,7 +1550,9 @@@ config DEBUG_LL_INCLUD
> > default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
> > default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
> > default "debug/s5pv210.S" if DEBUG_S5PV210_UART
> > - default "debug/sirf.S" if DEBUG_SIRFSOC_UART
> > - default "debug/sti.S" if DEBUG_STI_UART
> > + default "debug/sti.S" if DEBUG_STIH41X_ASC2
> > + default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
> > + default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
> > default "debug/stm32.S" if DEBUG_STM32_UART
> > default "debug/tegra.S" if DEBUG_TEGRA_UART
> > default "debug/ux500.S" if DEBUG_UX500_UART
> > @@@ -1659,8 -1579,6 +1585,7 @@@ config DEBUG_UART_PHY
> > default 0x02531000 if DEBUG_KEYSTONE_UART1
> > default 0x03010fe0 if ARCH_RPC
> > default 0x0700 if DEBUG_SUN9I_UART0
> > - default 0x09405000 if DEBUG_ZTE_ZX
> > + default 0x0953 if DEBUG_STIH418_SBC_ASC0
> > default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
> > DEBUG_VEXPRESS_UART0_CA9
> > default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
> > @@@ -1789,10 -1698,8 +1707,10 @@@
> > DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
> > DEBUG_S3C64XX_UART || \
> > DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> > - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> > + DEBUG_DIGICOLOR_UA0 || \
> > - DEBUG_AT91_UART || DEBUG_STM32_UART
> > + DEBUG_AT91_UART || DEBUG_STM32_UART || \
> > + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> > + DEBUG_STIH418_SBC_ASC0
> >
> > config DEBUG_UART_VIRT
> > hex "Virtual base address of debug UART"
> > @@@ -1854,12 -1760,9 +1772,11 @@@
> > default 0xfb02 if DEBUG_OMAP3UART3
> > default 0xfb042000 if DEBUG_OMAP3UART4
> > default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
> > - default 0xfc705000 if DEBUG_ZTE_ZX
> > default 0xfcfe8600 if DEBUG_BCM63XX_UART
> > default 0xfd00 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
> > + default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
> > default 0xfd883000 if DEBUG_ALPINE_UART0
> > + default 0xfdd32000 if DEBUG_STIH41X_ASC2
> > default 0xfe01 if STM32MP1_DEBUG_UART
> > default 0xfe017000 if DEBUG_MMP_UART2
> > default 0xfe018000 if DEBUG_MMP_UART3
> > @@@ -1904,10 -1802,8 +1816,10 @@@
> > DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
> > DEBUG_S3C64XX_UART || \
> > DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> > - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> > + DEBUG_DIGICOLOR_UA0 || \
> > - DEBUG_AT91_UART || DEBUG_STM32_UART
> > + DEBUG_AT91_UART || DEBUG_STM32_UART || \
> > + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> > + DEBUG_STIH418_SBC_ASC0
> >
> > config DEBUG_UART_8250_SHIFT
> > int "Register offset shift for the 8250 debug UART"
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
This is now a conflict between the arm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
pgpSaGbMImC3K.pgp
Description: OpenPGP digital signature
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 Description: OpenPGP digital signature
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 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 tree and commits:
> >
> > f3a732843acc ("ARM: remove sirf prima2/atlas platforms")
> > 89d4f98ae90d ("ARM: remove zte zx platform")
> >
> > from the arm-soc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > diff --cc arch/arm/Kconfig.debug
> > index 7a8697a97c98,c36c5d4c6e9c..
> > --- a/arch/arm/Kconfig.debug
> > +++ b/arch/arm/Kconfig.debug
> > @@@ -1623,10 -1546,7 +1550,9 @@@ config DEBUG_LL_INCLUD
> > default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
> > default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
> > default "debug/s5pv210.S" if DEBUG_S5PV210_UART
> > - default "debug/sirf.S" if DEBUG_SIRFSOC_UART
> > - default "debug/sti.S" if DEBUG_STI_UART
> > + default "debug/sti.S" if DEBUG_STIH41X_ASC2
> > + default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
> > + default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
> > default "debug/stm32.S" if DEBUG_STM32_UART
> > default "debug/tegra.S" if DEBUG_TEGRA_UART
> > default "debug/ux500.S" if DEBUG_UX500_UART
> > @@@ -1659,8 -1579,6 +1585,7 @@@ config DEBUG_UART_PHY
> > default 0x02531000 if DEBUG_KEYSTONE_UART1
> > default 0x03010fe0 if ARCH_RPC
> > default 0x0700 if DEBUG_SUN9I_UART0
> > - default 0x09405000 if DEBUG_ZTE_ZX
> > + default 0x0953 if DEBUG_STIH418_SBC_ASC0
> > default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
> > DEBUG_VEXPRESS_UART0_CA9
> > default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
> > @@@ -1789,10 -1698,8 +1707,10 @@@
> > DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
> > DEBUG_S3C64XX_UART || \
> > DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> > - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> > + DEBUG_DIGICOLOR_UA0 || \
> > - DEBUG_AT91_UART || DEBUG_STM32_UART
> > + DEBUG_AT91_UART || DEBUG_STM32_UART || \
> > + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> > + DEBUG_STIH418_SBC_ASC0
> >
> > config DEBUG_UART_VIRT
> > hex "Virtual base address of debug UART"
> > @@@ -1854,12 -1760,9 +1772,11 @@@
> > default 0xfb02 if DEBUG_OMAP3UART3
> > default 0xfb042000 if DEBUG_OMAP3UART4
> > default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
> > - default 0xfc705000 if DEBUG_ZTE_ZX
> > default 0xfcfe8600 if DEBUG_BCM63XX_UART
> > default 0xfd00 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
> > + default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
> > default 0xfd883000 if DEBUG_ALPINE_UART0
> > + default 0xfdd32000 if DEBUG_STIH41X_ASC2
> > default 0xfe01 if STM32MP1_DEBUG_UART
> > default 0xfe017000 if DEBUG_MMP_UART2
> > default 0xfe018000 if DEBUG_MMP_UART3
> > @@@ -1904,10 -1802,8 +1816,10 @@@
> > DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
> > DEBUG_S3C64XX_UART || \
> > DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> > - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> > + DEBUG_DIGICOLOR_UA0 || \
> > - DEBUG_AT91_UART || DEBUG_STM32_UART
> > + DEBUG_AT91_UART || DEBUG_STM32_UART || \
> > + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> > + DEBUG_STIH418_SBC_ASC0
> >
> > config DEBUG_UART_8250_SHIFT
> > int "Register offset shift for the 8250 debug UART"
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
>
> --
> Cheers,
> Stephen Rothwell
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")
> 6e959ad8bb90 ("ARM: 9041/1: sti LL_UART: add STiH418 SBC UART0 support")
>
> from the arm tree and commits:
>
> f3a732843acc ("ARM: remove sirf prima2/atlas platforms")
> 89d4f98ae90d ("ARM: remove zte zx platform")
>
> from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc arch/arm/Kconfig.debug
> index 7a8697a97c98,c36c5d4c6e9c..
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@@ -1623,10 -1546,7 +1550,9 @@@ config DEBUG_LL_INCLUD
> default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
> default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
> default "debug/s5pv210.S" if DEBUG_S5PV210_UART
> - default "debug/sirf.S" if DEBUG_SIRFSOC_UART
> -default "debug/sti.S" if DEBUG_STI_UART
> +default "debug/sti.S" if DEBUG_STIH41X_ASC2
> +default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
> +default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
> default "debug/stm32.S" if DEBUG_STM32_UART
> default "debug/tegra.S" if DEBUG_TEGRA_UART
> default "debug/ux500.S" if DEBUG_UX500_UART
> @@@ -1659,8 -1579,6 +1585,7 @@@ config DEBUG_UART_PHY
> default 0x02531000 if DEBUG_KEYSTONE_UART1
> default 0x03010fe0 if ARCH_RPC
> default 0x0700 if DEBUG_SUN9I_UART0
> - default 0x09405000 if DEBUG_ZTE_ZX
> +default 0x0953 if DEBUG_STIH418_SBC_ASC0
> default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
> DEBUG_VEXPRESS_UART0_CA9
> default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
> @@@ -1789,10 -1698,8 +1707,10 @@@
> DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
> DEBUG_S3C64XX_UART || \
> DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> + DEBUG_DIGICOLOR_UA0 || \
> -DEBUG_AT91_UART || DEBUG_STM32_UART
> +DEBUG_AT91_UART || DEBUG_STM32_UART || \
> +DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> +DEBUG_STIH418_SBC_ASC0
>
> config DEBUG_UART_VIRT
> hex "Virtual base address of debug UART"
> @@@ -1854,12 -1760,9 +1772,11 @@@
> default 0xfb02 if DEBUG_OMAP3UART3
> default 0xfb042000 if DEBUG_OMAP3UART4
> default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
> - default 0xfc705000 if DEBUG_ZTE_ZX
> default 0xfcfe8600 if DEBUG_BCM63XX_UART
> default 0xfd00 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
> +default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
> default 0xfd883000 if DEBUG_ALPINE_UART0
> +default 0xfdd32000 if DEBUG_STIH41X_ASC2
> default 0xfe01 if STM32MP1_DEBUG_UART
> default 0xfe017000 if DEBUG_MMP_UART2
> default 0xfe018000 if DEBUG_MMP_UART3
> @@@ -1904,10 -1802,8 +1816,10 @@@
> DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
> DEBUG_S3C64XX_UART || \
> DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
> - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
> + DEBUG_DIGICOLOR_UA0 || \
> -DEBUG_AT91_UART || DEBUG_STM32_UART
> +DEBUG_AT91_UART || DEBUG_STM32_UART || \
> +DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
> +DEBUG_STIH418_SBC_ASC0
>
> config DEBUG_UART_8250_SHIFT
> int "Register offset shift for the 8250 debug UART"
With the merge window about to open, this is a reminder that this
conflict still exists.
--
Cheers,
Stephen Rothwell
pgpv8WzgVY9M7.pgp
Description: OpenPGP digital signature
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 arm tree and commit:
>
> 59d3ae9a5bf6 ("ARM: remove Intel iop33x and iop13xx support")
>
> from the arm-soc tree.
>
> I fixed it up (the latter removed the file, so I did that) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
Yes, that's good. Russell, you could drop the patch from your tree if
you like, or let Linus handle the trivial conflict.
Arnd
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 tree and commit:
>
> 9e634cae7256 ("ARM: ux500: simplify secondary boot")
>
> from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Your resolution looks correct, thanks Stephen!
--
Florian
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:
>
> 19c233b79d1a ("ARM: appropriate __init annotation for const data")
>
> from the arm-soc tree.
>
> I fixed it up (the former removed the file, so I did that, then added
> the following patch) and can carry the fix as necessary (no action
> is required).
These fixups are now being applied to the merge of the arm tree as the
arm-soc commit above has been merged into Linus' tree.
> From: Stephen Rothwell
> Date: Wed, 12 Aug 2015 09:39:15 +1000
> Subject: [PATCH] ARM: fix for PSCI code movement
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/firmware/psci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> index a6956007dd38..42700f09a8c5 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -337,7 +337,7 @@ out_put_node:
> return err;
> }
>
> -static const struct of_device_id psci_of_match[] __initconst = {
> +static const struct of_device_id const psci_of_match[] __initconst = {
> { .compatible = "arm,psci", .data = psci_0_1_init},
> { .compatible = "arm,psci-0.2", .data = psci_0_2_init},
> {},
> --
> 2.5.0
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 __init annotation for const data")
>
> from the arm-soc tree.
>
> I fixed it up (the former removed the file, so I did that, then added
> the following patch) and can carry the fix as necessary (no action
> is required).
The fix is correct, thanks.
>
> From: Stephen Rothwell
> Date: Wed, 12 Aug 2015 09:39:15 +1000
> Subject: [PATCH] ARM: fix for PSCI code movement
>
> Signed-off-by: Stephen Rothwell
> ---
> drivers/firmware/psci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> index a6956007dd38..42700f09a8c5 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -337,7 +337,7 @@ out_put_node:
> return err;
> }
>
> -static const struct of_device_id psci_of_match[] __initconst = {
> +static const struct of_device_id const psci_of_match[] __initconst = {
> { .compatible = "arm,psci", .data = psci_0_1_init},
> { .compatible = "arm,psci-0.2", .data = psci_0_2_init},
> {},
> --
> 2.5.0
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 01ea63d99397 ("ARM: sirf: add two debug ports for CSRatlas7
> SoC") and e23814da8262 ("ARM: digicolor: add low level debug support")
> from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Both of these conflict resolutions (the other one you sent after this)
look reasonable, thanks Stephen.
--
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 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: sa1100: Migrate DEBUG_LL macros to shared
> >> directory") and debf843bf7ee ("ARM: 8146/1: Seperate DEBUG_UART_PHYS
> >> from DEBUG_LL on EP93XX") from the arm tree and commits d8a00916b303
> >> ("ARM: meson: debug: add debug UART for earlyprintk support"),
> >> b125170a39ea ("CNS3xxx: Fix debug UART") and b51312bebfa4 ("ARM:
> >> BCM63XX: add low-level UART debug support") from the arm-soc tree.
> >>
> >> I fixed it up (hopefully - see below) and can carry the fix as
> >> necessary (no action is required).
> >>
> >> You may be able to clean some of this up by using intermediate config
> >> symbols that are selected by the low level symbols and depended upon by
> >> the higher level config symbols.
> >
> > Actually, I'll drop the patch set I have. I didn't spot this earlier,
> > but people seem to have a hard time sorting stuff numerically:
> >
> > default 0xffd82340 if ARCH_IOP13XX
> > + default 0xfffb if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
> > + default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
> > + default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
> > default 0xfff36000 if DEBUG_HIGHBANK_UART
>
> Oops. This is disappointing from my point-of-view but there's no one to
> blame but me.
>
> I have fixed this in my tree and will requeue for 3.19.
Okay, I've dropped 8141/1 onwards, so the only patches I have from your
series are:
ep93xx: Enable DEBUG_LL_UART_PL01X
versatile: Enable DEBUG_LL_UART_PL01X
--
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 shared directory"), e38c399ca584
>> ("ARM: 8144/2: netx: Migrate DEBUG_LL macros to shared directory"),
>> 6741cacfa3f1 ("ARM: 8145/1: sa1100: Migrate DEBUG_LL macros to shared
>> directory") and debf843bf7ee ("ARM: 8146/1: Seperate DEBUG_UART_PHYS
>> from DEBUG_LL on EP93XX") from the arm tree and commits d8a00916b303
>> ("ARM: meson: debug: add debug UART for earlyprintk support"),
>> b125170a39ea ("CNS3xxx: Fix debug UART") and b51312bebfa4 ("ARM:
>> BCM63XX: add low-level UART debug support") from the arm-soc tree.
>>
>> I fixed it up (hopefully - see below) and can carry the fix as
>> necessary (no action is required).
>>
>> You may be able to clean some of this up by using intermediate config
>> symbols that are selected by the low level symbols and depended upon by
>> the higher level config symbols.
>
> Actually, I'll drop the patch set I have. I didn't spot this earlier,
> but people seem to have a hard time sorting stuff numerically:
>
> default 0xffd82340 if ARCH_IOP13XX
> + default 0xfffb if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
> + default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
> + default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
> default 0xfff36000 if DEBUG_HIGHBANK_UART
Oops. This is disappointing from my point-of-view but there's no one to
blame but me.
I have fixed this in my tree and will requeue for 3.19.
> It also looks like the same is true for arm-soc:
>
>> @@@ -1174,9 -1133,7 +1213,10 @@@
>> default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
>> DEBUG_S3C2410_UART2)
>> default 0x7c0003f8 if FOOTBRIDGE
>> + default 0x8001 if DEBUG_SA1100_UART1
>> + default 0x8003 if DEBUG_SA1100_UART2
>> + default 0x8005 if DEBUG_SA1100_UART3
>> +default 0x7800 if DEBUG_CNS3XXX
>
> Last time I checked, 0x7800 comes before 0x7c0003f8.
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 arch/arm/Kconfig.debug, just not shown in the conflict resolution above. -- Cheers, Stephen Rothwells...@canb.auug.org.au signature.asc Description: PGP signature
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: Migrate DEBUG_LL macros to shared directory"),
> 6741cacfa3f1 ("ARM: 8145/1: sa1100: Migrate DEBUG_LL macros to shared
> directory") and debf843bf7ee ("ARM: 8146/1: Seperate DEBUG_UART_PHYS
> from DEBUG_LL on EP93XX") from the arm tree and commits d8a00916b303
> ("ARM: meson: debug: add debug UART for earlyprintk support"),
> b125170a39ea ("CNS3xxx: Fix debug UART") and b51312bebfa4 ("ARM:
> BCM63XX: add low-level UART debug support") from the arm-soc tree.
>
> I fixed it up (hopefully - see below) and can carry the fix as
> necessary (no action is required).
>
> You may be able to clean some of this up by using intermediate config
> symbols that are selected by the low level symbols and depended upon by
> the higher level config symbols.
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc arch/arm/Kconfig.debug
> index 4fcff7737dd1,0d714e10f0a2..
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@@ -348,13 -365,13 +365,20 @@@ choic
> Say Y here if you want the debug print routines to direct
> their output to UART1 serial port on KEYSTONE2 devices.
>
> + config DEBUG_KS8695_UART
> + bool "KS8695 Debug UART"
> + depends on ARCH_KS8695
> + help
> +Say Y here if you want kernel low-level debugging support
> +on KS8695.
> +
> + config DEBUG_MESON_UARTAO
> + bool "Kernel low-level debugging via Meson6 UARTAO"
> + depends on ARCH_MESON
> + help
> + Say Y here if you want kernel low-lever debugging support
> + on Amlogic Meson6 based platforms on the UARTAO.
> +
> config DEBUG_MMP_UART2
> bool "Kernel low-level debugging message via MMP UART2"
> depends on ARCH_MMP
> @@@ -1136,9 -1091,12 +1170,13 @@@ config DEBUG_UART_825
> ARCH_IOP33X || ARCH_IXP4XX || \
> ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
>
> + # Compatibility options for BCM63xx
> + config DEBUG_UART_BCM63XX
> + def_bool ARCH_BCM_63XX
> +
> config DEBUG_UART_PHYS
> hex "Physical base address of debug UART"
> + default 0x00100a00 if DEBUG_NETX_UART
> default 0x01c2 if DEBUG_DAVINCI_DMx_UART0
> default 0x01c28000 if DEBUG_SUNXI_UART0
> default 0x01c28400 if DEBUG_SUNXI_UART1
> @@@ -1174,9 -1133,7 +1213,10 @@@
> default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
> DEBUG_S3C2410_UART2)
> default 0x7c0003f8 if FOOTBRIDGE
> + default 0x8001 if DEBUG_SA1100_UART1
> + default 0x8003 if DEBUG_SA1100_UART2
> + default 0x8005 if DEBUG_SA1100_UART3
> + default 0x7800 if DEBUG_CNS3XXX
> default 0x8007 if DEBUG_IMX23_UART
> default 0x80074000 if DEBUG_IMX28_UART
> default 0x8023 if DEBUG_PICOXCELL_UART
> @@@ -1204,17 -1163,14 +1246,18 @@@
> default 0xff69 if DEBUG_RK32_UART2
> default 0xffc02000 if DEBUG_SOCFPGA_UART
> default 0xffd82340 if ARCH_IOP13XX
> + default 0xfffb if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
> + default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
> + default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
> default 0xfff36000 if DEBUG_HIGHBANK_UART
> + default 0xfffe8600 if DEBUG_UART_BCM63XX
> default 0xf700 if ARCH_IOP33X
> depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
> DEBUG_LL_UART_EFM32 || \
> - DEBUG_UART_8250 || DEBUG_UART_PL01X || \
> + DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
> - DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
> - DEBUG_UART_BCM63XX
> + DEBUG_MSM_UART || DEBUG_NETX_UART || DEBUG_QCOM_UARTDM || \
> + DEBUG_S3C24XX_UART || DEBUG_SA1100_UART || \
> - ARCH_EP93XX
> ++ ARCH_EP93XX || DEBUG_UART_BCM63XX
>
> config DEBUG_UART_VIRT
> hex "Virtual base address of debug UART"
> @@@ -1241,14 -1196,14 +1284,17 @@@
> default 0xf7008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
> DEBUG_S3C2410_UART2)
> default 0xf7fc9000 if DEBUG_BERLIN_UART
> + default 0xf8007000 if DEBUG_HIP04_UART
> default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9
> + default 0xf801 if DEBUG_SA1100_UART1
> + default 0xf803 if DEBUG_SA1100_UART2
> + default 0xf805 if DEBUG_
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: Migrate DEBUG_LL macros to shared directory"),
> 6741cacfa3f1 ("ARM: 8145/1: sa1100: Migrate DEBUG_LL macros to shared
> directory") and debf843bf7ee ("ARM: 8146/1: Seperate DEBUG_UART_PHYS
> from DEBUG_LL on EP93XX") from the arm tree and commits d8a00916b303
> ("ARM: meson: debug: add debug UART for earlyprintk support"),
> b125170a39ea ("CNS3xxx: Fix debug UART") and b51312bebfa4 ("ARM:
> BCM63XX: add low-level UART debug support") from the arm-soc tree.
>
> I fixed it up (hopefully - see below) and can carry the fix as
> necessary (no action is required).
>
> You may be able to clean some of this up by using intermediate config
> symbols that are selected by the low level symbols and depended upon by
> the higher level config symbols.
Actually, I'll drop the patch set I have. I didn't spot this earlier,
but people seem to have a hard time sorting stuff numerically:
default 0xffd82340 if ARCH_IOP13XX
+ default 0xfffb if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
+ default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
+ default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
default 0xfff36000 if DEBUG_HIGHBANK_UART
It also looks like the same is true for arm-soc:
> @@@ -1174,9 -1133,7 +1213,10 @@@
> default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
> DEBUG_S3C2410_UART2)
> default 0x7c0003f8 if FOOTBRIDGE
> +default 0x8001 if DEBUG_SA1100_UART1
> +default 0x8003 if DEBUG_SA1100_UART2
> +default 0x8005 if DEBUG_SA1100_UART3
> + default 0x7800 if DEBUG_CNS3XXX
Last time I checked, 0x7800 comes before 0x7c0003f8.
--
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 common l2c310 early resume functionality") and 15b0bc4041ba
> ("ARM: l2c: exynos: convert to generic l2c OF initialisation (and
> thereby fix it)") from the arm tree and commit b5b9324a6296 ("ARM:
> exynos: don't run exynos4 l2x0 setup on other platforms") from the
> arm-soc tree.
>
> I fixed it up (the former removes the code updated by the latter) and
> can carry the fix as necessary (no action is required).
Looks good. Thanks.
-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 ("bus: mvebu: pass the coherency availability
> information at init time") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
This fix seems to be the good thing to do.
Thanks,
Gregory
>
>
> ___
> linux-arm-kernel mailing list
> linux-arm-ker...@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 bcd2360c1ff9 ("arm: at91: move platfarm_data to
> include/linux/platform_data/atmel.h") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).
Yes, good fix that has to be carried...
Thanks, bye,
- --
Nicolas Ferre
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/
iQEcBAEBAgAGBQJQs0buAAoJEAf03oE53VmQMPgH/0Gynlb5BBImnjSU75mh/dPC
ob/lTJv3w/2gUKPqbOgyxTSmMc9ckFcDELAhFYt+df9hKfOMBzZAUPHLEclZolZ+
AqpnIjGq88TYWMgaREUZ2bigTrzuWKqHiIWV/AoNcz2slhWC//CHK6z9SHE7hZOI
zZFwf326v0dRkm4g785cqalg7pNxQDpE6iMZXuifb8zPWePgKBxqHyPRCbhP1dwu
T4XQ3IgnrvzWcqz/V4mr8kppJXzHNfDEsVZ2XfndhUKVFY4qMGZhFBoTlI6LhNWO
Nu2mD7TaENoKRijLYrdMfidJ65uwAGtEWA6UxEfV1VWVddSsi/D8OuniBta+Ewg=
=zF93
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 b7a3f8db07c1 ("ARM: integrator: use __iomem
> pointers for MMIO") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks correct!
Thanks.
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
