From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754843AbcI3HJt (ORCPT ); Fri, 30 Sep 2016 03:09:49 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:4009 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751827AbcI3HJk (ORCPT ); Fri, 30 Sep 2016 03:09:40 -0400 Subject: Re: linux-next: manual merge of the tty tree with the v4l-dvb tree To: Stephen Rothwell , Greg KH , "Mauro Carvalho Chehab" References: <20160930133319.57ac11a3@canb.auug.org.au> CC: , , Songjun Wu From: Nicolas Ferre Organization: atmel Message-ID: Date: Fri, 30 Sep 2016 09:09:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <20160930133319.57ac11a3@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.145.133.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 30/09/2016 à 05:33, Stephen Rothwell a écrit : > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > MAINTAINERS > > between commit: > > 71fb2c74287d ("[media] MAINTAINERS: atmel-isc: add entry for Atmel ISC") > > from the v4l-dvb tree and commit: > > 5615c3715749 ("MAINTAINERS: update entry for atmel_serial 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. Both changes are merged well. Thanks Stephen, -- Nicolas Ferre