* linux-next: please update the i.MX tree @ 2012-01-10 0:52 Stephen Rothwell 2012-01-10 8:30 ` Sascha Hauer 0 siblings, 1 reply; 5+ messages in thread From: Stephen Rothwell @ 2012-01-10 0:52 UTC (permalink / raw) To: Sascha Hauer Cc: linux-next, linux-kernel, Olof Johansson, Arnd Bergmann, linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 893 bytes --] Hi Sascha, 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. CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree. -- Cheers, Stephen Rothwell sfr@canb•auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: please update the i.MX tree 2012-01-10 0:52 linux-next: please update the i.MX tree Stephen Rothwell @ 2012-01-10 8:30 ` Sascha Hauer 2012-01-10 22:34 ` Stephen Rothwell 0 siblings, 1 reply; 5+ messages in thread From: Sascha Hauer @ 2012-01-10 8:30 UTC (permalink / raw) To: Stephen Rothwell Cc: linux-next, linux-kernel, Olof Johansson, Arnd Bergmann, linux-arm-kernel On Tue, Jan 10, 2012 at 11:52:18AM +1100, Stephen Rothwell wrote: > Hi Sascha, > > 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. Sascha -- 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 | ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: please update the i.MX tree 2012-01-10 8:30 ` Sascha Hauer @ 2012-01-10 22:34 ` Stephen Rothwell 2012-01-11 8:34 ` Sascha Hauer 0 siblings, 1 reply; 5+ messages in thread From: Stephen Rothwell @ 2012-01-10 22:34 UTC (permalink / raw) To: Sascha Hauer Cc: linux-next, linux-kernel, Olof Johansson, Arnd Bergmann, linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 845 bytes --] Hi Sascha, On Tue, 10 Jan 2012 09:30:20 +0100 Sascha Hauer <s.hauer@pengutronix•de> 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@canb•auug.org.au [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: please update the i.MX tree 2012-01-10 22:34 ` Stephen Rothwell @ 2012-01-11 8:34 ` Sascha Hauer 2012-01-11 10:37 ` Stephen Rothwell 0 siblings, 1 reply; 5+ messages in thread From: Sascha Hauer @ 2012-01-11 8:34 UTC (permalink / raw) To: Stephen Rothwell Cc: linux-next, linux-kernel, Olof Johansson, Arnd Bergmann, linux-arm-kernel On Wed, Jan 11, 2012 at 09:34:57AM +1100, Stephen Rothwell wrote: > Hi Sascha, > > On Tue, 10 Jan 2012 09:30:20 +0100 Sascha Hauer <s.hauer@pengutronix•de> 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. I failed to wait until my push returned. It failed due to non-fast-forward pushing. Really fixed this now. > > Should I, instead, just remove that tree from linux-next and let you send > stuff just via the arm-soc (or arm)tree? Yes, that's probably best. That's what I do anyway. Sascha -- 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 | ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: please update the i.MX tree 2012-01-11 8:34 ` Sascha Hauer @ 2012-01-11 10:37 ` Stephen Rothwell 0 siblings, 0 replies; 5+ messages in thread From: Stephen Rothwell @ 2012-01-11 10:37 UTC (permalink / raw) To: Sascha Hauer Cc: linux-next, linux-kernel, Olof Johansson, Arnd Bergmann, linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 477 bytes --] Hi Sascha, On Wed, 11 Jan 2012 09:34:29 +0100 Sascha Hauer <s.hauer@pengutronix•de> wrote: > > On Wed, Jan 11, 2012 at 09:34:57AM +1100, Stephen Rothwell wrote: > > > > Should I, instead, just remove that tree from linux-next and let you send > > stuff just via the arm-soc (or arm)tree? > > Yes, that's probably best. That's what I do anyway. OK, done. -- Cheers, Stephen Rothwell sfr@canb•auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-01-11 10:37 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-10 0:52 linux-next: please update the i.MX tree Stephen Rothwell 2012-01-10 8:30 ` Sascha Hauer 2012-01-10 22:34 ` Stephen Rothwell 2012-01-11 8:34 ` Sascha Hauer 2012-01-11 10:37 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox