From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753532AbbCPIRg (ORCPT ); Mon, 16 Mar 2015 04:17:36 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:35934 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753426AbbCPIRc (ORCPT ); Mon, 16 Mar 2015 04:17:32 -0400 X-Sasl-enc: CBEgnksT2+RrAeEa/RTwUMrJx93nlD548HVQuQU6y95v 1426493546 Date: Mon, 16 Mar 2015 09:12:24 +0100 From: Greg KH To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Magnus Damm , Simon Horman , Daniel Mack Subject: Re: linux-next: manual merge of the kdbus tree with the arm-soc tree Message-ID: <20150316081224.GA12392@kroah.com> References: <20150316161626.32e838f5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150316161626.32e838f5@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 16, 2015 at 04:16:26PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the kdbus tree got a conflict in > Documentation/Makefile between commit c6535e1e0361 ("Documentation: > Remove ZBOOT MMC/SDHI utility and docs") from the arm-soc tree and > commit 48480f8c402c ("kdbus: add documentation") from the kdbus 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 Documentation/Makefile > index bc0548201755,5e3fde632d03..000000000000 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@@ -1,4 -1,4 +1,4 @@@ > -subdir-y := accounting arm auxdisplay blackfin connector \ > +subdir-y := accounting auxdisplay blackfin connector \ > - filesystems filesystems ia64 laptops mic misc-devices \ > + filesystems filesystems ia64 kdbus laptops mic misc-devices \ > networking pcmcia prctl ptp spi timers vDSO video4linux \ > watchdog Thanks, the merge looks fine to me. greg k-h