Re: linux-next: manual merge of the i.MX tree with the tree
From: Sascha Hauer
Date: Mon May 23 2011 - 03:19:19 EST
On Mon, May 23, 2011 at 11:45:42AM +1000, Stephen Rothwell wrote:
> Hi Sascha,
> Today's linux-next merge of the i.MX tree got a conflict in
> arch/arm/mach-imx/Kconfig arch/arm/plat-mxc/Kconfig between the "same"
> commits from the arm tree and the i.MX tree.
> Please don't rearrange commits when upstreaming them - or if you do, then
> update the source tree as well. I am assuming that the commits that are
> in the arm tree amount to the same as what has been int the i.MX tree for
> some time. There are a couple of extra commits in the i.MX tree, so I
> just used the i.MX version of those files. This may not work.
I have forgotten that my tree shows up in -next twice once rmk pulled
from me. I removed these patches from my -next queue and will hopefully
remember it next time aswell.
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/