Hi Sasch,
On Tue, 9 Feb 2010 11:46:39 +0100 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote:
>
> I am the Freescale i.MX maintainer for the kernel.
> Currently the ARM i.MX part is not in -next. Could you include
> the following branch into your -next tree?
>
> git://git.pengutronix.de/git/imx/linux-2.6.git for-next
>
> It currently has one merge conflict with next which is trivial
> to solve. I could resolve this by pulling in the ASoC branch
> into mine. Please let me know what you prefer.
I have added your tree starting today. As you say, the conflict is
trivial and "git rerere" will remember it for me, so no problem from my
side.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@xxxxxxxxxxxxxxxx
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
Attachment:
pgpFsHERWzglv.pgp
Description: PGP signature
