On Thu, Apr 2, 2015 at 10:45 PM, James Morris <jmorris@xxxxxxxxx> wrote: > On Thu, 2 Apr 2015, Paul Moore wrote: > >> necessary to resolve conflicts. When I do a test merge into your next branch >> I see the following: >> >> #git pull selinux next >> From git://git.infradead.org/users/pcmoore/selinux >> * branch next -> FETCH_HEAD >> Auto-merging security/selinux/selinuxfs.c >> Merge made by the 'recursive' strategy. >> 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(-) >> >> The merge diffstat looks as I would expect, the only odd thing is selinuxfs.c, >> but it looks like that is simply because your next branch doesn't include the >> error code fix I sent you for v4.0: >> >> commit 6436a123a147db51a0b06024a8350f4c230e73ff >> Author: Joe Perches <joe@xxxxxxxxxxx> >> Date: Mon Mar 23 18:01:35 2015 -0700 >> >> selinux: fix sel_write_enforce broken return value >> >> Return a negative error value like the rest of the entries in this >> function. >> >> Cc: <stable@xxxxxxxxxxxxxxx> >> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> >> Acked-by: Stephen Smalley <sds@xxxxxxxxxxxxx> >> [PM: tweaked subject line] >> Signed-off-by: Paul Moore <pmoore@xxxxxxxxxx> >> >> Are you asking because you ran into a problem, or just to check? > > 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? -- 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.
