linux-kernel - Re: New tree for linux-next

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAAVeFu+PxpM9=kbB_HAbHf=6qxNpkbCQxkeFoKEx+swAWpQ_6g@mail.gmail.com>
Date:	Thu, 21 Mar 2013 10:42:48 +0900
From:	Alexandre Courbot <gnurou@...il.com>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	LKML <linux-kernel@...r.kernel.org>,
	linux-next <linux-next@...r.kernel.org>,
	Linus Walleij <linus.walleij@...aro.org>
Subject: Re: New tree for linux-next

On Thu, Mar 21, 2013 at 9:09 AM, Grant Likely <grant.likely@...retlab.ca> 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.

Alex.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/