From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751299AbdH2G6G (ORCPT ); Tue, 29 Aug 2017 02:58:06 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:36929 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbdH2G6E (ORCPT ); Tue, 29 Aug 2017 02:58:04 -0400 X-ME-Sender: X-Sasl-enc: J4FibYxlpnvfWyVUlDr0qJBtPAz8iVC+675dAxg/N99+ 1503989883 Date: Tue, 29 Aug 2017 08:58:10 +0200 From: Greg KH To: Stephen Rothwell Cc: Helge Deller , Parisc List , Linux-Next Mailing List , Linux Kernel Mailing List , Arvind Yadav Subject: Re: linux-next: manual merge of the tty tree with the parisc-hd tree Message-ID: <20170829065810.GB13428@kroah.com> References: <20170829163513.4b119a91@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170829163513.4b119a91@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 Tue, Aug 29, 2017 at 04:35:13PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > drivers/tty/serial/8250/8250_gsc.c > > between commit: > > 9e466f101e19 ("parisc/8250_gsc: Fix section mismatches") > > from the parisc-hd tree and commit: > > 0d474f7fad3b ("tty: 8250: constify parisc_device_id") > > from the tty tree. > > I fixed it up (the former is a superset of the latter) 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 letting me know about this, and the other conflict here. greg k-h