From: Nicolas Ferre <nicolas.ferre@atmel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, Greg KH <greg@kroah•com>,
Mauro Carvalho Chehab <mchehab@osg•samsung.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Songjun Wu <songjun.wu@microchip•com>
Subject: Re: linux-next: manual merge of the tty tree with the v4l-dvb tree
Date: Fri, 30 Sep 2016 09:09:34 +0200 [thread overview]
Message-ID: <b401cb59-3545-758e-2f5a-2245651e8314@atmel.com> (raw)
In-Reply-To: <20160930133319.57ac11a3@canb.auug.org.au>
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
prev parent reply other threads:[~2016-09-30 7:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 3:33 linux-next: manual merge of the tty tree with the v4l-dvb tree Stephen Rothwell
2016-09-30 5:44 ` Greg KH
2016-09-30 7:09 ` Nicolas Ferre [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b401cb59-3545-758e-2f5a-2245651e8314@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@osg$(echo .)samsung.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=songjun.wu@microchip$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox