Messages in this thread | | | Date | Tue, 22 Nov 2016 05:35:38 -0500 | From | Richard Guy Briggs <> | Subject | Re: linux-next: manual merge of the audit tree with Linus' tree |
| |
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!
> Stephen Rothwell > > diff --cc include/uapi/linux/audit.h > index 208df7b44e90,c8dc97bc2c1b..000000000000 > --- a/include/uapi/linux/audit.h > +++ b/include/uapi/linux/audit.h > @@@ -329,11 -330,11 +330,13 @@@ enum > #define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT 0x00000001 > #define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME 0x00000002 > #define AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH 0x00000004 > +#define AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND 0x00000008 > + #define AUDIT_FEATURE_BITMAP_SESSIONID_FILTER 0x00000010 > #define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \ > AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | \ > AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH | \ > - AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND) > ++ AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND | \ > + AUDIT_FEATURE_BITMAP_SESSIONID_FILTER) > > /* deprecated: AUDIT_VERSION_* */ > #define AUDIT_VERSION_LATEST AUDIT_FEATURE_BITMAP_ALL
- RGB
-- Richard Guy Briggs <rgb@redhat.com> Kernel Security Engineering, Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635
| |