Messages in this thread | | | Date | Wed, 29 Jan 2014 09:18:06 +0800 | From | Shawn Guo <> | Subject | Re: linux-next: manual merge of the imx-mxs tree with the arm tree |
| |
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
| |