From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932564AbcASBCZ (ORCPT ); Mon, 18 Jan 2016 20:02:25 -0500 Received: from ozlabs.org ([103.22.144.67]:54827 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932528AbcASBCO (ORCPT ); Mon, 18 Jan 2016 20:02:14 -0500 Date: Tue, 19 Jan 2016 12:02:12 +1100 From: Stephen Rothwell To: Paul Moore Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Guy Briggs , Linus Torvalds Subject: linux-next: manual merge of the audit tree with Linus' tree Message-ID: <20160119120212.2a8872a8@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Paul, Today's linux-next merge of the audit tree got a conflict in: kernel/audit.c between commit: f48a942926c5 ("audit: include auditd's threads in audit_log_start() wait exception") from Linus' tree and commit: 14eeba1d242e ("audit: include auditd's threads in audit_log_start() wait exception") from the audit tree. This happened because the audit tree was rebased before being sent to Linus and this patch was "tweaked". I just used the version from Linus' tree. Please clean up the audit tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au