From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Howells <dhowells@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Stephen Smalley <sds@tycho.nsa.gov>,
James Morris <jamorris@linux.microsoft.com>,
Casey Schaufler <casey@schaufler-ca.com>
Subject: Re: linux-next: manual merge of the selinux tree with the keys tree
Date: Tue, 28 Jan 2020 21:28:11 -0500 [thread overview]
Message-ID: <CAHC9VhSB4++aQJBD9ezvX=Bq+E-XvUVb+gS1hTgJm=xj3HtBrQ@mail.gmail.com> (raw)
In-Reply-To: <20200129122530.7d4659f6@canb.auug.org.au>
On Tue, Jan 28, 2020 at 8:25 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
Hello.
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc include/linux/lsm_audit.h
> > index 734d67889826,99d629fd9944..000000000000
> > --- a/include/linux/lsm_audit.h
> > +++ b/include/linux/lsm_audit.h
> > @@@ -74,7 -74,7 +74,8 @@@ struct common_audit_data
> > #define LSM_AUDIT_DATA_FILE 12
> > #define LSM_AUDIT_DATA_IBPKEY 13
> > #define LSM_AUDIT_DATA_IBENDPORT 14
> > -#define LSM_AUDIT_DATA_LOCKDOWN 15
> > +#define LSM_AUDIT_DATA_NOTIFICATION 15
> > ++#define LSM_AUDIT_DATA_LOCKDOWN 16
> > union {
> > struct path path;
> > struct dentry *dentry;
>
> This is now a conflict between the keys tree and Linus' tree.
Presumably it basically the same as above? If so, it should be okay
to renumber the LSM_AUDIT_DATA_xxx defines as needed, they aren't
visible to userspace in any way, and really shouldn't be visible
outside of security/.
--
paul moore
www.paul-moore.com
next prev parent reply other threads:[~2020-01-29 2:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 23:50 linux-next: manual merge of the selinux tree with the keys tree Stephen Rothwell
2019-12-09 23:55 ` Paul Moore
2020-01-29 1:25 ` Stephen Rothwell
2020-01-29 2:28 ` Paul Moore [this message]
2020-02-11 23:35 Stephen Rothwell
2020-02-12 2:03 ` Paul Moore
2020-02-12 12:03 ` Richard Haines
2020-02-13 23:02 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHC9VhSB4++aQJBD9ezvX=Bq+E-XvUVb+gS1hTgJm=xj3HtBrQ@mail.gmail.com' \
--to=paul@paul-moore.com \
--cc=casey@schaufler-ca.com \
--cc=dhowells@redhat.com \
--cc=jamorris@linux.microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sds@tycho.nsa.gov \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).