lkml.org 
[lkml]   [2020]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the selinux tree with the keys tree
    Hi all,

    On Tue, 10 Dec 2019 10:50:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    >
    > Today's linux-next merge of the selinux tree got a conflict in:
    >
    > include/linux/lsm_audit.h
    >
    > between commit:
    >
    > 59336b0f8000 ("smack: Implement the watch_key and post_notification hooks")
    >
    > from the keys tree and commit:
    >
    > 59438b46471a ("security,lockdown,selinux: implement SELinux lockdown")
    >
    > from the selinux tree.
    >
    > 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.

    --
    Cheers,
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2020-01-29 02:27    [W:3.104 / U:0.684 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site