From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752196AbbGPEuW (ORCPT ); Thu, 16 Jul 2015 00:50:22 -0400 Received: from ozlabs.org ([103.22.144.67]:37488 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537AbbGPEuV (ORCPT ); Thu, 16 Jul 2015 00:50:21 -0400 Date: Thu, 16 Jul 2015 14:50:19 +1000 From: Stephen Rothwell To: Andrew Morton , Russell King Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , Laurent Dufour Subject: linux-next: manual merge of the akpm-current tree with the arm tree Message-ID: <20150716145019.03c07a2e@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-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 Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/arm/include/asm/Kbuild between commit: 57853e8906a0 ("ARM: 8403/1: kbuild: don't use generic mcs_spinlock.h header") from the arm tree and commit: 74cf1a5a0c64 ("mm: clean up per architecture MM hook header files") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/include/asm/Kbuild index 517ef6dd22b9,30b3bc1666d2..000000000000 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@@ -12,6 -12,8 +12,7 @@@ generic-y += irq_regs. generic-y += kdebug.h generic-y += local.h generic-y += local64.h -generic-y += mcs_spinlock.h + generic-y += mm-arch-hooks.h generic-y += msgbuf.h generic-y += param.h generic-y += parport.h