linux-kernel - Re: Please include the namespace file-descriptors tree in 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 for Android: free password hash cracker in your pocket

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

Message-ID: <m1sjsmdjke.fsf@fess.ebiederm.org>
Date:	Tue, 10 May 2011 20:04:17 -0700
From:	ebiederm@...ssion.com (Eric W. Biederman)
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"David S. Miller" <davem@...emloft.net>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	James Bottomley <James.Bottomley@...e.de>,
	Parisc List <linux-parisc@...r.kernel.org>
Subject: Re: Please include the namespace file-descriptors tree in linux-next

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi Eric,
>
> On Tue, 10 May 2011 15:44:51 -0700 ebiederm@...ssion.com (Eric W. Biederman) wrote:
>>
>> These changes have just been through review and I expect
>> to send Linus a pull request when the merge window opens.
>> 
>> This tree holds changes that significantly simply the userspace
>> interface to working with namespaces.
>> 
>> I had to pull some of net-next and the parisc tress to be able to
>> avoid conflicts with system call numbers.  Hopefully that is not
>> a problem.
>
> That should be fine as Dave's tree never rebases and the parisc tree
> looks pretty stable.  Just keep an eye on those trees, just in case.

Good point.  I have talked to James and Dave so they know I pulled their
trees.  My lazy side says I expect you will get a merge conflict with my
tree in linux-next if someone rebases.  But I will definitely keep my
eyes out and at the very least double check that all is well before I
send Linus a pull request.  

Eric
--
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/