From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Subject: Re: linux-next: manual merge of the audit tree with Linus' tree Date: Tue, 06 Oct 2015 13:21:14 -0400 Message-ID: <1479357.JFI07qj0hM@sifl> References: <20151006135501.2d8bbb5b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <20151006135501.2d8bbb5b@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Vander Stoep , linux-audit@redhat.com List-Id: linux-audit@redhat.com On Tuesday, October 06, 2015 01:55:01 PM Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the audit tree got a conflict in: > > include/linux/lsm_audit.h > > between commit: > > 671a2781ff01 ("security: add ioctl specific auditing to lsm_audit") > > from Linus' tree and commit: > > 43cfd5e38587 ("audit: constify parts of common_audit_data and > lsm_network_audit") > > from the audit tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks, that patch looks correct, although I'm going to drop the patch causing this problem for the time being as there are some oddities with the build warning that you posted which aren't immediately obvious to me. Something weird is causing it to work in audit#next but throw a warning when applied on top of Linus' current ... I'll reapply the patch once I've resolved the issue. -- paul moore www.paul-moore.com