lkml.org 
[lkml]   [2016]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: linux-next: manual merge of the audit tree with Linus' tree
    On Tue, Nov 22, 2016 at 5:35 AM, Richard Guy Briggs <rgb@redhat.com> wrote:
    > On 2016-11-22 16:29, Stephen Rothwell wrote:
    >> Hi Paul,
    >
    > Hi Stephen,
    >
    >> Today's linux-next merge of the audit tree got a conflict in:
    >>
    >> include/uapi/linux/audit.h
    >>
    >> between commit:
    >>
    >> 7ff89ac608d9 ("audit: add exclude filter extension to feature bitmap")
    >>
    >> from Linus' tree and commit:
    >>
    >> 0489410368df ("audit: add support for session ID user filter")
    >>
    >> from the audit tree.
    >
    > Ok, I expected this conflict...
    >
    >> 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.
    >
    > The fix looks as expected. Thanks!

    Yes, +1 to what Richard already said; I've had to apply similar
    patches for some of my test kernels.

    --
    paul moore
    www.paul-moore.com

    \
     
     \ /
      Last update: 2016-11-22 22:25    [W:3.169 / U:0.620 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site