From: Nicolas Ferre <nicolas.ferre@microchip•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, Greg KH <greg@kroah•com>,
Nicolas Ferre <nicolas.ferre@atmel•com>,
Alexandre Belloni <alexandre.belloni@bootlin•com>,
Ludovic Desroches <ludovic.desroches@microchip•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Marcus Folkesson <marcus.folkesson@gmail•com>,
Kent Gustavsson <kent@minoris•se>
Subject: Re: linux-next: manual merge of the staging tree with the at91 tree
Date: Tue, 18 Sep 2018 09:27:37 +0200 [thread overview]
Message-ID: <982f3fea-27f7-2349-51dc-24e34ef7176e@microchip.com> (raw)
In-Reply-To: <20180918131238.2838bedd@canb.auug.org.au>
On 18/09/2018 at 05:12, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 5ae2f1f30197 ("MAINTAINERS: move former ATMEL entries to proper MICROCHIP locatioat91n")
>
> from the at91 tree and commit:
>
> 010de20412fc ("MAINTAINERS: Add entry for mcp3911 ADC driver")
>
> from the staging 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.
Resolution looks good to me.
Thanks. Best regards,
--
Nicolas Ferre
next prev parent reply other threads:[~2018-09-18 7:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 3:12 linux-next: manual merge of the staging tree with the at91 tree Stephen Rothwell
2018-09-18 7:27 ` Nicolas Ferre [this message]
2018-09-18 7:30 ` Greg KH
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=982f3fea-27f7-2349-51dc-24e34ef7176e@microchip.com \
--to=nicolas.ferre@microchip$(echo .)com \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=kent@minoris$(echo .)se \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ludovic.desroches@microchip$(echo .)com \
--cc=marcus.folkesson@gmail$(echo .)com \
--cc=nicolas.ferre@atmel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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