From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751347AbdFEGuI (ORCPT ); Mon, 5 Jun 2017 02:50:08 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:50851 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297AbdFEGuG (ORCPT ); Mon, 5 Jun 2017 02:50:06 -0400 X-ME-Sender: X-Sasl-enc: e/o9+kHW8LVTEG8GjsGfDvCpQtZVrkZx56srqqMQB8M4 1496645405 Date: Mon, 5 Jun 2017 08:50:03 +0200 From: Greg KH To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Okash Khawaja , Alan Cox Subject: Re: linux-next: manual merge of the staging tree with the tty tree Message-ID: <20170605065003.GG14680@kroah.com> References: <20170605145749.4d6df5cd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170605145749.4d6df5cd@canb.auug.org.au> User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 05, 2017 at 02:57:49PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > include/uapi/linux/tty.h > > between commit: > > 8a8dabf2dd68 ("tty: handle the case where we cannot restore a line discipline") > > from the tty tree and commit: > > 1ab92da32e37 ("staging: speakup: add tty-based comms functions") > > from the staging tree. > > I fixed it up (I used the tty tree version) 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. I'm the maintainer of both, I knew this would happen and made it so it was obvious what version to take :) thanks, greg k-h