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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx:
initial SolidRun Cubox-i support") from the arm tree and various commits
from the imx-mxs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/Makefile
index b9d6a8b485e0,2841184f354c..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -150,15 -137,32 +153,35 @@@ dtb-$(CONFIG_ARCH_MXC) += 
  	imx53-m53evk.dtb \
  	imx53-mba53.dtb \
  	imx53-qsb.dtb \
+ 	imx53-qsrb.dtb \
  	imx53-smd.dtb \
+ 	imx53-tx53-x03x.dtb \
+ 	imx53-tx53-x13x.dtb \
+ 	imx53-voipac-bsb.dtb \
 +	imx6dl-cubox-i.dtb \
+ 	imx6dl-dfi-fs700-m60.dtb \
+ 	imx6dl-gw51xx.dtb \
+ 	imx6dl-gw52xx.dtb \
+ 	imx6dl-gw53xx.dtb \
+ 	imx6dl-gw54xx.dtb \
 +	imx6dl-hummingboard.dtb \
+ 	imx6dl-nitrogen6x.dtb \
  	imx6dl-sabreauto.dtb \
+ 	imx6dl-sabrelite.dtb \
  	imx6dl-sabresd.dtb \
  	imx6dl-wandboard.dtb \
  	imx6q-arm2.dtb \
+ 	imx6q-cm-fx6.dtb \
 +	imx6q-cubox-i.dtb \
+ 	imx6q-dfi-fs700-m60.dtb \
+ 	imx6q-dmo-edmqmx6.dtb \
+ 	imx6q-gk802.dtb \
+ 	imx6q-gw51xx.dtb \
+ 	imx6q-gw52xx.dtb \
+ 	imx6q-gw53xx.dtb \
+ 	imx6q-gw5400-a.dtb \
+ 	imx6q-gw54xx.dtb \
+ 	imx6q-nitrogen6x.dtb \
  	imx6q-phytec-pbab01.dtb \
  	imx6q-sabreauto.dtb \
  	imx6q-sabrelite.dtb \

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Russell King - ARM Linux]

On Wed, Jan 29, 2014 at 11:35:14AM +1100, Stephen Rothwell wrote:
> Hi Shawn,
> 
> Today's linux-next merge of the imx-mxs tree got a conflict in
> arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
> initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx:
> initial SolidRun Cubox-i support") from the arm tree and various commits
> from the imx-mxs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Nice easy add/add which Linus won't complain about.  Thanks Stephen.

This should move to between Linus' and Shawn's tree over the next
couple of days since I've now sent my final pull request for this
window.

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".

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

[Shawn Guo]

On Wed, Jan 29, 2014 at 01:13:10AM +0000, Russell King - ARM Linux wrote:
> On Wed, Jan 29, 2014 at 11:35:14AM +1100, Stephen Rothwell wrote:
> > Hi Shawn,
> > 
> > Today's linux-next merge of the imx-mxs tree got a conflict in
> > arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
> > initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx:
> > initial SolidRun Cubox-i support") from the arm tree and various commits
> > from the imx-mxs tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Nice easy add/add which Linus won't complain about.  Thanks Stephen.
> 
> This should move to between Linus' and Shawn's tree over the next
> couple of days since I've now sent my final pull request for this
> window.

I will rebase my branch on v3.14-rc1 once it's out.

Shawn

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

Hi Shawn,

On Wed, 29 Jan 2014 09:18:06 +0800 Shawn Guo <shawn.guo@linaro.org> wrote:
>
> I will rebase my branch on v3.14-rc1 once it's out.

Um, does that mean that all that stuff is *not* destined for v3.14? ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Shawn Guo]

On Wed, Jan 29, 2014 at 01:25:13PM +1100, Stephen Rothwell wrote:
> Hi Shawn,
> 
> On Wed, 29 Jan 2014 09:18:06 +0800 Shawn Guo <shawn.guo@linaro.org> wrote:
> >
> > I will rebase my branch on v3.14-rc1 once it's out.
> 
> Um, does that mean that all that stuff is *not* destined for v3.14? ...

Yes, Stephen.  That's the case.  If it causes problem for you, you can
keep excluding my for-next branch from linux-next until I rebase it on
v3.14-rc1.

Shawn

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got conflicts in
arch/arm/boot/dts/Makefile, arch/arm/boot/dts/imx6dl-hummingboard.dts,
arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi and
arch/arm/boot/dts/imx6qdl-microsom.dtsi between commits 728d5599f5d8
("ARM: imx: initial SolidRun HummingBoard support") and d79c363fd9cd
("ARM: imx: initial SolidRun Cubox-i support") from the arm tree and a
series of commits from the imx-mxs tree.

Russell told me that the imx-ims tree changes have not yet been approved
for v3.13 inclusion and they conflict fairly badly, so for today I have
dropped the imx-mxs tree.  Let me know what I should do in the future.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2200 bytes --]

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/Kconfig.debug between commit 5e33abe38413 ("ARM: debug: move
PL01X debug include into arch/arm/include/debug/") from the arm tree and
commit d1814df976f2 ("ARM: imx: add low-level debug for vybrid") from the
imx-mxs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 6638398,0aa5b9d..0000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -879,12 -782,30 +886,13 @@@ config DEBUG_LL_INCLUD
  				 DEBUG_IMX53_UART ||\
  				 DEBUG_IMX6Q_UART || \
  				 DEBUG_IMX6SL_UART
 -	default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
 -				      DEBUG_KEYSTONE_UART1
 -	default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
 -				   DEBUG_MVEBU_UART_ALTERNATE
 -	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
 -	default "debug/nomadik.S" if DEBUG_NOMADIK_UART
 -	default "debug/nspire.S" if 	DEBUG_NSPIRE_CX_UART || \
 -					DEBUG_NSPIRE_CLASSIC_UART
  	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
 -	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
 -	default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
 -				 DEBUG_MMP_UART3
 -	default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
  	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
 -	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
  	default "debug/sti.S" if DEBUG_STI_UART
 -	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
  	default "debug/tegra.S" if DEBUG_TEGRA_UART
 -	default "debug/u300.S" if DEBUG_U300_UART
  	default "debug/ux500.S" if DEBUG_UX500_UART
 -	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
 -		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \
 -		DEBUG_VEXPRESS_UART0_CRX
 +	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
+ 	default "debug/vf.S" if DEBUG_VF_UART
  	default "debug/vt8500.S" if DEBUG_VT8500_UART0
  	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
  	default "mach/debug-macro.S"

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]