From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752471AbdGCC7E (ORCPT ); Sun, 2 Jul 2017 22:59:04 -0400 Received: from ozlabs.org ([103.22.144.67]:43525 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752143AbdGCC7B (ORCPT ); Sun, 2 Jul 2017 22:59:01 -0400 Date: Mon, 3 Jul 2017 12:58:59 +1000 From: Stephen Rothwell To: Jonathan Corbet , Masahiro Yamada Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Kamil Rytarowski Subject: Re: linux-next: manual merge of the jc_docs tree with the kbuild tree Message-ID: <20170703125859.0678914b@canb.auug.org.au> In-Reply-To: <20170626111331.5443587b@canb.auug.org.au> References: <20170626111331.5443587b@canb.auug.org.au> 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 all, With the merge window opening, just a reminder that this conflict still exists. On Mon, 26 Jun 2017 11:13:31 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the jc_docs tree got a conflict in: > > scripts/kernel-doc-xml-ref > > between commit: > > cb77f0d623ff ("scripts: Switch to more portable Perl shebang") > > from the kbuild tree and commit: > > 52b3f239bb69 ("Docs: clean up some DocBook loose ends") > > from the jc_docs tree. > > I fixed it up (the latter removed the file, so I did that) 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. -- Cheers, Stephen Rothwell