From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751272AbdH2GfS (ORCPT ); Tue, 29 Aug 2017 02:35:18 -0400 Received: from ozlabs.org ([103.22.144.67]:48841 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750796AbdH2GfQ (ORCPT ); Tue, 29 Aug 2017 02:35:16 -0400 Date: Tue, 29 Aug 2017 16:35:13 +1000 From: Stephen Rothwell To: Greg KH , Helge Deller , Parisc List Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Arvind Yadav Subject: linux-next: manual merge of the tty tree with the parisc-hd tree Message-ID: <20170829163513.4b119a91@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 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. -- Cheers, Stephen Rothwell