From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Michael Ellerman <mpe@ellerman•id.au>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
PowerPC <linuxppc-dev@lists•ozlabs.org>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Stefan Popa <stefan.popa@analog•com>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Michael Hanselmann <linux-kernel@hansmi•ch>
Subject: Re: linux-next: manual merge of the staging tree with the powerpc tree
Date: Fri, 27 Jul 2018 10:36:19 +0200 [thread overview]
Message-ID: <20180727083619.GA17942@kroah.com> (raw)
In-Reply-To: <20180727175911.76ed6d44@canb.auug.org.au>
On Fri, Jul 27, 2018 at 05:59:11PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> d69ccc00c497 ("MAINTAINERS: Remove the entry for the orphaned ams driver")
>
> from the powerpc tree and commit:
>
> 28d1a7ac2a0d ("iio: dac: Add AD5758 support")
>
> 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.
Looks good to me, thanks!
greg k-h
prev parent reply other threads:[~2018-07-27 8:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 7:59 linux-next: manual merge of the staging tree with the powerpc tree Stephen Rothwell
2018-07-27 8:36 ` Greg KH [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=20180727083619.GA17942@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linux-kernel@hansmi$(echo .)ch \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=stefan.popa@analog$(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