From: Sascha Hauer <s.hauer@pengutronix•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Subject: Re: linux-next: please update the i.MX tree
Date: Wed, 11 Jan 2012 09:34:29 +0100 [thread overview]
Message-ID: <20120111083429.GU5446@pengutronix.de> (raw)
In-Reply-To: <20120111093457.af3caeabe2dbf50b70942334@canb.auug.org.au>
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 |
next prev parent reply other threads:[~2012-01-11 8:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-01-11 10:37 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120111083429.GU5446@pengutronix.de \
--to=s.hauer@pengutronix$(echo .)de \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox