On Sat, 4 Apr 2015, Paul Moore wrote: > I'll have to look closer when I'm back in front of a system, perhaps I missed > it. > > More importantly, did you pull from the SELinux upstream branch? > Nope. > -- > paul moore > www.paul-moore.com > > > > On April 4, 2015 11:49:29 AM James Morris <jmorris@xxxxxxxxx> wrote: > > > On Fri, 3 Apr 2015, Paul Moore wrote: > > > > > On Fri, Apr 3, 2015 at 11:07 AM, James Morris <jmorris@xxxxxxxxx> wrote: > > > > On Fri, 3 Apr 2015, Paul Moore wrote: > > > > > > > > > > Yep, I saw that and some backmerge strangeness. Did you rebase your > > tree > > > > > > after I created a fresh branch? > > > > > > > > > > It looks like I'm based off your tree from Feb 1st, the last commit > > > > > from your tree looks to be: 11cd64a234d5a1a7111627ef947beb0e5fad9e71. > > > > > > > > > > Do you need me to rebase? > > > > > > > > > > > > > Yep, see if that fixes things. > > > > > > Okay, try it now; I rebased selinux#upstream against your latest next > > > branch. The same patches are included, just in a slightly different > > > order, and I included the error code fix for -stable since it isn't in > > > your next branch or Linus' current. > > > > > > > It's in Linus' current as 6436a123a147db51a > > > > -- > > James Morris > > <jmorris@xxxxxxxxx> > > > > -- James Morris <jmorris@xxxxxxxxx> _______________________________________________ Selinux mailing list Selinux@xxxxxxxxxxxxx To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx. To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
