From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932892AbcKVKfn (ORCPT ); Tue, 22 Nov 2016 05:35:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58164 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932777AbcKVKfm (ORCPT ); Tue, 22 Nov 2016 05:35:42 -0500 Date: Tue, 22 Nov 2016 05:35:38 -0500 From: Richard Guy Briggs To: Stephen Rothwell Cc: Paul Moore , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the audit tree with Linus' tree Message-ID: <20161122103538.GS27818@madcap2.tricolour.ca> References: <20161122162936.674b7531@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161122162936.674b7531@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 22 Nov 2016 10:35:41 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Kernel Security Engineering, Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635