Re: linux-next: the selinux tree needs cleaning up

2014-06-26 Thread James Morris
On 06/26/2014 08:12 AM, Stephen Rothwell wrote: Hi James, On Wed, 25 Jun 2014 20:51:43 +1000 James Morris wrote: I haven't pulled in Paul's tree, I merged with the latest Linus release. Ummm, yesterday your security tree

Re: linux-next: the selinux tree needs cleaning up

2014-06-26 Thread James Morris
On 06/26/2014 08:12 AM, Stephen Rothwell wrote: Hi James, On Wed, 25 Jun 2014 20:51:43 +1000 James Morris james.l.mor...@oracle.com wrote: I haven't pulled in Paul's tree, I merged with the latest Linus release. Ummm, yesterday your security tree

Re: linux-next: the selinux tree needs cleaning up

2014-06-25 Thread Stephen Rothwell
Hi James, On Wed, 25 Jun 2014 20:51:43 +1000 James Morris wrote: > > I haven't pulled in Paul's tree, I merged with the latest Linus release. Ummm, yesterday your security tree (git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next) moved from commit 2fd4e6698f08

Re: linux-next: the selinux tree needs cleaning up

2014-06-25 Thread Paul Moore
On Wednesday, June 25, 2014 09:59:28 AM Stephen Rothwell wrote: > Well, I see that James has pulled your tree, so past problems are now > moot. He has some duplicate commits in his tree now and Linus will get > a few more when he next pulls James' tree. We just need to avoid this > going forward.

Re: linux-next: the selinux tree needs cleaning up

2014-06-25 Thread James Morris
On 06/25/2014 09:59 AM, Stephen Rothwell wrote: Hi Paul, On Tue, 24 Jun 2014 14:03:08 -0400 Paul Moore wrote: On Friday, June 20, 2014 12:06:28 PM Paul Moore wrote: {big snip} Stephen, assuming for a moment that I created a fresh branch, based against 3.15, and then added the SELinux

Re: linux-next: the selinux tree needs cleaning up

2014-06-25 Thread James Morris
On 06/25/2014 09:59 AM, Stephen Rothwell wrote: Hi Paul, On Tue, 24 Jun 2014 14:03:08 -0400 Paul Moore p...@paul-moore.com wrote: On Friday, June 20, 2014 12:06:28 PM Paul Moore wrote: {big snip} Stephen, assuming for a moment that I created a fresh branch, based against 3.15, and then

Re: linux-next: the selinux tree needs cleaning up

2014-06-25 Thread Paul Moore
On Wednesday, June 25, 2014 09:59:28 AM Stephen Rothwell wrote: Well, I see that James has pulled your tree, so past problems are now moot. He has some duplicate commits in his tree now and Linus will get a few more when he next pulls James' tree. We just need to avoid this going forward.

Re: linux-next: the selinux tree needs cleaning up

2014-06-25 Thread Stephen Rothwell
Hi James, On Wed, 25 Jun 2014 20:51:43 +1000 James Morris james.l.mor...@oracle.com wrote: I haven't pulled in Paul's tree, I merged with the latest Linus release. Ummm, yesterday your security tree (git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next) moved from

Re: linux-next: the selinux tree needs cleaning up

2014-06-24 Thread Stephen Rothwell
Hi Paul, On Tue, 24 Jun 2014 14:03:08 -0400 Paul Moore wrote: > > On Friday, June 20, 2014 12:06:28 PM Paul Moore wrote: > > {big snip} > > > Stephen, assuming for a moment that I created a fresh branch, based against > > 3.15, and then added the SELinux patches for 3.16 (basically the few new

Re: linux-next: the selinux tree needs cleaning up

2014-06-24 Thread Paul Moore
On Friday, June 20, 2014 12:06:28 PM Paul Moore wrote: {big snip} > Stephen, assuming for a moment that I created a fresh branch, based against > 3.15, and then added the SELinux patches for 3.16 (basically the few new > patches that were in the ole #next branch) would that serve as a reasonable

Re: linux-next: the selinux tree needs cleaning up

2014-06-24 Thread Paul Moore
On Friday, June 20, 2014 12:06:28 PM Paul Moore wrote: {big snip} Stephen, assuming for a moment that I created a fresh branch, based against 3.15, and then added the SELinux patches for 3.16 (basically the few new patches that were in the ole #next branch) would that serve as a reasonable

Re: linux-next: the selinux tree needs cleaning up

2014-06-24 Thread Stephen Rothwell
Hi Paul, On Tue, 24 Jun 2014 14:03:08 -0400 Paul Moore p...@paul-moore.com wrote: On Friday, June 20, 2014 12:06:28 PM Paul Moore wrote: {big snip} Stephen, assuming for a moment that I created a fresh branch, based against 3.15, and then added the SELinux patches for 3.16 (basically

Re: linux-next: the selinux tree needs cleaning up

2014-06-20 Thread Paul Moore
On Friday, June 20, 2014 08:59:31 AM Stephen Rothwell wrote: > Hi Paul, Hello again. > On Thu, 19 Jun 2014 15:47:01 -0400 Paul Moore wrote: > > I want to avoid use a -rcX release as the foundation of any of my trees; > > the -rc releases aren't as stable and it goes against what we're trying >

Re: linux-next: the selinux tree needs cleaning up

2014-06-20 Thread Serge E. Hallyn
Quoting Stephen Rothwell (s...@canb.auug.org.au): > Hi Serge, > > On Fri, 20 Jun 2014 05:43:56 +0200 "Serge E. Hallyn" wrote: > > > > The duplicates were the result of several misunderstandings and general > > naivity all on my part. I'm actually still not clear on what usually > > happens with

Re: linux-next: the selinux tree needs cleaning up

2014-06-20 Thread Serge E. Hallyn
Quoting Stephen Rothwell (s...@canb.auug.org.au): Hi Serge, On Fri, 20 Jun 2014 05:43:56 +0200 Serge E. Hallyn se...@hallyn.com wrote: The duplicates were the result of several misunderstandings and general naivity all on my part. I'm actually still not clear on what usually happens

Re: linux-next: the selinux tree needs cleaning up

2014-06-20 Thread Paul Moore
On Friday, June 20, 2014 08:59:31 AM Stephen Rothwell wrote: Hi Paul, Hello again. On Thu, 19 Jun 2014 15:47:01 -0400 Paul Moore p...@paul-moore.com wrote: I want to avoid use a -rcX release as the foundation of any of my trees; the -rc releases aren't as stable and it goes against what

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Stephen Rothwell
Hi Serge, On Fri, 20 Jun 2014 05:43:56 +0200 "Serge E. Hallyn" wrote: > > The duplicates were the result of several misunderstandings and general > naivity all on my part. I'm actually still not clear on what usually > happens with the selinux tree - it feeds into linux-next, then gets >

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Serge E. Hallyn
Quoting Stephen Rothwell (s...@canb.auug.org.au): > Hi Paul, > > On Thu, 19 Jun 2014 15:47:01 -0400 Paul Moore wrote: > > > > I want to avoid use a -rcX release as the foundation of any of my trees; > > the - > > rc releases aren't as stable and it goes against what we're trying to do > > with

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Stephen Rothwell
Hi Paul, On Thu, 19 Jun 2014 15:47:01 -0400 Paul Moore wrote: > > I want to avoid use a -rcX release as the foundation of any of my trees; the - > rc releases aren't as stable and it goes against what we're trying to do with > the different Linux Security trees. Unfortunately, based on what

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Paul Moore
On Friday, June 20, 2014 01:08:37 AM Stephen Rothwell wrote: > Hi Paul, Howdy. > On Wed, 18 Jun 2014 14:26:27 -0400 Paul Moore wrote: > > On Wednesday, June 18, 2014 08:40:46 AM Stephen Rothwell wrote: I'm going to chop up your email a bit so it makes more sense when replying, my apologies if

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Stephen Rothwell
Hi Paul, On Wed, 18 Jun 2014 14:26:27 -0400 Paul Moore wrote: > > On Wednesday, June 18, 2014 08:40:46 AM Stephen Rothwell wrote: > > > > The selinux tree (git://git.infradead.org/users/pcmoore/selinux#next) > > contains some commits going back to January and also has merges of > > v3.13, v3.14

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Stephen Rothwell
Hi Paul, On Wed, 18 Jun 2014 14:26:27 -0400 Paul Moore p...@paul-moore.com wrote: On Wednesday, June 18, 2014 08:40:46 AM Stephen Rothwell wrote: The selinux tree (git://git.infradead.org/users/pcmoore/selinux#next) contains some commits going back to January and also has merges of

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Paul Moore
On Friday, June 20, 2014 01:08:37 AM Stephen Rothwell wrote: Hi Paul, Howdy. On Wed, 18 Jun 2014 14:26:27 -0400 Paul Moore p...@paul-moore.com wrote: On Wednesday, June 18, 2014 08:40:46 AM Stephen Rothwell wrote: I'm going to chop up your email a bit so it makes more sense when replying,

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Stephen Rothwell
Hi Paul, On Thu, 19 Jun 2014 15:47:01 -0400 Paul Moore p...@paul-moore.com wrote: I want to avoid use a -rcX release as the foundation of any of my trees; the - rc releases aren't as stable and it goes against what we're trying to do with the different Linux Security trees. Unfortunately,

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Serge E. Hallyn
Quoting Stephen Rothwell (s...@canb.auug.org.au): Hi Paul, On Thu, 19 Jun 2014 15:47:01 -0400 Paul Moore p...@paul-moore.com wrote: I want to avoid use a -rcX release as the foundation of any of my trees; the - rc releases aren't as stable and it goes against what we're trying to do

Re: linux-next: the selinux tree needs cleaning up

2014-06-19 Thread Stephen Rothwell
Hi Serge, On Fri, 20 Jun 2014 05:43:56 +0200 Serge E. Hallyn se...@hallyn.com wrote: The duplicates were the result of several misunderstandings and general naivity all on my part. I'm actually still not clear on what usually happens with the selinux tree - it feeds into linux-next, then

Re: linux-next: the selinux tree needs cleaning up

2014-06-18 Thread Paul Moore
On Wednesday, June 18, 2014 08:40:46 AM Stephen Rothwell wrote: > Hi Paul, > > The selinux tree (git://git.infradead.org/users/pcmoore/selinux#next) > contains some commits going back to January and also has merges of > v3.13, v3.14 and v3.15 in it. If you rebase that tree onto v3.16-rc1, > you

Re: linux-next: the selinux tree needs cleaning up

2014-06-18 Thread Paul Moore
On Wednesday, June 18, 2014 08:40:46 AM Stephen Rothwell wrote: Hi Paul, The selinux tree (git://git.infradead.org/users/pcmoore/selinux#next) contains some commits going back to January and also has merges of v3.13, v3.14 and v3.15 in it. If you rebase that tree onto v3.16-rc1, you find

linux-next: the selinux tree needs cleaning up

2014-06-17 Thread Stephen Rothwell
Hi Paul, The selinux tree (git://git.infradead.org/users/pcmoore/selinux#next) contains some commits going back to January and also has merges of v3.13, v3.14 and v3.15 in it. If you rebase that tree onto v3.16-rc1, you find that it has onlt 2 unique commits (the most recent 2) which means that

linux-next: the selinux tree needs cleaning up

2014-06-17 Thread Stephen Rothwell
Hi Paul, The selinux tree (git://git.infradead.org/users/pcmoore/selinux#next) contains some commits going back to January and also has merges of v3.13, v3.14 and v3.15 in it. If you rebase that tree onto v3.16-rc1, you find that it has onlt 2 unique commits (the most recent 2) which means that