From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Songjun Wu <songjun.wu@microchip.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>
Subject: Re: linux-next: manual merge of the tty tree with the v4l-dvb tree
Date: Fri, 30 Sep 2016 07:44:16 +0200 [thread overview]
Message-ID: <20160930054416.GA5458@kroah.com> (raw)
In-Reply-To: <20160930133319.57ac11a3@canb.auug.org.au>
On Fri, Sep 30, 2016 at 01:33:19PM +1000, Stephen Rothwell wrote:
> 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.
Ick, MAINTAINERS is a tough thing to merge at times, sorry, patch looks
fine to me.
greg k-h
next prev parent reply other threads:[~2016-09-30 5:44 UTC|newest]
Thread overview: 4+ 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 [this message]
2016-09-30 7:09 ` Nicolas Ferre
2016-09-30 7:09 ` Nicolas Ferre
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=20160930054416.GA5458@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=nicolas.ferre@atmel.com \
--cc=sfr@canb.auug.org.au \
--cc=songjun.wu@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.