From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934205AbcKVVZQ (ORCPT ); Tue, 22 Nov 2016 16:25:16 -0500 Received: from mail-vk0-f52.google.com ([209.85.213.52]:36651 "EHLO mail-vk0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932436AbcKVVZO (ORCPT ); Tue, 22 Nov 2016 16:25:14 -0500 MIME-Version: 1.0 X-Originating-IP: [96.230.190.88] In-Reply-To: <20161122103538.GS27818@madcap2.tricolour.ca> References: <20161122162936.674b7531@canb.auug.org.au> <20161122103538.GS27818@madcap2.tricolour.ca> From: Paul Moore Date: Tue, 22 Nov 2016 16:25:12 -0500 Message-ID: Subject: Re: linux-next: manual merge of the audit tree with Linus' tree To: Richard Guy Briggs Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 22, 2016 at 5:35 AM, Richard Guy Briggs 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