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. # git pull git://git.infradead.org/users/pcmoore/selinux upstream From git://git.infradead.org/users/pcmoore/selinux * branch upstream -> FETCH_HEAD Updating 4f9a60f..6ad2606 Fast-forward security/selinux/avc.c | 6 ++-- security/selinux/selinuxfs.c | 2 +- security/selinux/ss/avtab.c | 72 ++++++++++++++++++++++++++++++++---------- security/selinux/ss/avtab.h | 8 +++-- security/selinux/ss/mls.c | 10 ++---- security/selinux/ss/services.c | 6 +--- 6 files changed, 68 insertions(+), 36 deletions(-) -- paul moore www.paul-moore.com _______________________________________________ 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.
