From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S933214AbcKHKPt (ORCPT <rfc822;w@1wt.eu>);
        Tue, 8 Nov 2016 05:15:49 -0500
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:44056 "EHLO
        out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S933101AbcKHKPp (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 8 Nov 2016 05:15:45 -0500
X-ME-Sender: <xms:0KUhWJZ-XyeqLmSAv0dCgaGCU-iMT7ps4_9hCjx08B8hyKoch1_L6A>
X-Sasl-enc: y+cEFZmOEY2SuKBdWOogVWr6jV/qzDt4KeY5psUHdlgI 1478600143
Date: Tue, 8 Nov 2016 11:15:54 +0100
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Mauro Carvalho Chehab <mchehab@s-opensource.com>,
        Jiri Slaby <jslaby@suse.cz>
Subject: Re: linux-next: manual merge of the tty tree with the jc_docs tree
Message-ID: <20161108101554.GA17244@kroah.com>
References: <20161108163013.24d165f3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20161108163013.24d165f3@canb.auug.org.au>
User-Agent: Mutt/1.7.1 (2016-10-04)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Nov 08, 2016 at 04:30:13PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   Documentation/VGA-softcursor.txt
> 
> between commits:
> 
>   27641b953c54 ("Documentation/VGA-softcursor.txt: convert to ReST markup")
>   9d85025b0418 ("docs-rst: create an user's manual book")
> 
> from the jc_docs tree and commit:
> 
>   b9c8b7fc252c ("vgacon: remove prehistoric macros")
> 
> from the tty tree.
> 
> I fixed it up (I deleted it - since 9d85025b0418 moved it - but that
> means it may need fixing up in its new location to match any relevant
> changes in b9c8b7fc252c) 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.

Thanks, I'll work on sending a documentation patch after 4.10-rc1 to fix
this up.

greg k-h