Re: New tree for linux-next
From: Alexandre Courbot
Date: Wed Mar 20 2013 - 21:43:14 EST
On Thu, Mar 21, 2013 at 9:09 AM, Grant Likely <grant.likely@xxxxxxxxxxxx> wrote:
>>> - My branch is based on the latest stable, similarly to what I have
>>> seen elsewhere. One of the patches triggers a merge conflict on
>>> today's linux-next due to a whitespace change. Is there something I
>>> can do to fix this?
>> Do not worry about merge conflicts, that is my and Linus' job.
> Latest stable? As in based on one of the linux-stable point releases
> (That Greg does) or based on Linus' tree? It must be based on Linus'
> tree to be mergable into mainline.
That's based on Linus' latest rc. "stable" was ambiguous here, sorry.
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/