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 S1752649AbcEUDbJ (ORCPT <rfc822;w@1wt.eu>);
	Fri, 20 May 2016 23:31:09 -0400
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43287 "EHLO
	out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752598AbcEUDaw (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 20 May 2016 23:30:52 -0400
X-Sasl-enc: DJTDjl1x0sqYUfzXWSgs07Be7rFHqALHMf7R9F6hLHTT 1463801450
Date: Fri, 20 May 2016 20:26:47 -0700
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Andrei Pistirica <andrei.pistirica@microchip.com>,
        Ralf Baechle <ralf@linux-mips.org>,
        Vladimir Murzin <vladimir.murzin@arm.com>,
        Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the tty tree with Linus' tree
Message-ID: <20160521032647.GA6509@kroah.com>
References: <20160520123151.0c8a7c47@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160520123151.0c8a7c47@canb.auug.org.au>
User-Agent: Mutt/1.6.1 (2016-04-27)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, May 20, 2016 at 12:31:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   include/uapi/linux/serial_core.h
> 
> between commits:
> 
>   157b9394709e ("serial: pic32_uart: Add PIC32 UART driver")
>   07b75260ebc2 ("Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus")
> 
> from Linus' tree and commit:
> 
>   041f031def33 ("serial: mps2-uart: add MPS2 UART driver")
> 
> from the tty tree.
> 
> I fixed it up (see below) 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 for this, I've warned Linus to watch out for this when he merges
my tree into his.

greg k-h