Hi Sascha, On Tue, 10 Jan 2012 09:30:20 +0100 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote: > > On Tue, Jan 10, 2012 at 11:52:18AM +1100, Stephen Rothwell wrote: > > > > It looks like most (if not all) of the i.MX tree has been merged into the > > arm-soc (and Linus') tree, so could you please update the i.MX tree to > > eliminate the conflicts I am getting. > > Did this. Sorry, I was not aware that there is something in this branch. Did you push it out? I just checked and it hasn't changed. Just to be clear, I am fetching git://git.pengutronix.de/git/imx/linux-2.6.git branch for-next and it hasn't changed since last September. Should I, instead, just remove that tree from linux-next and let you send stuff just via the arm-soc (or arm)tree? -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpU9EhsK0cWj.pgp
Description: PGP signature
