From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>, Olof Johansson <olof@lixom•net>,
ARM <linux-arm-kernel@lists•infradead.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Patrick Venture <venture@google•com>
Subject: Re: linux-next: manual merge of the char-misc tree with the arm-soc tree
Date: Tue, 30 Apr 2019 10:14:08 +0200 [thread overview]
Message-ID: <20190430081408.GB8245@kroah.com> (raw)
In-Reply-To: <20190430174051.038c77c8@canb.auug.org.au>
On Tue, Apr 30, 2019 at 05:40:51PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in:
>
> drivers/misc/Kconfig
> drivers/misc/Makefile
>
> between commit:
>
> 524feb799408 ("soc: add aspeed folder and misc drivers")
>
> from the arm-soc tree and commit:
>
> 01c60dcea9f7 ("drivers/misc: Add Aspeed P2A control driver")
>
> from the char-misc tree.
>
> I fixed it up (see below - though the additions probably want to be
> moved as in the arm-soc commit)
People are still arguing about this, so let's leave this as-is for now
:)
Thanks for the merge resolution,
greg k-h
next prev parent reply other threads:[~2019-04-30 8:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 7:40 linux-next: manual merge of the char-misc tree with the arm-soc tree Stephen Rothwell
2019-04-30 8:14 ` Greg KH [this message]
2019-05-08 5:01 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 5:51 Stephen Rothwell
2022-03-15 7:35 ` Greg KH
2014-11-21 6:24 Stephen Rothwell
2014-11-21 23:14 ` Tony Lindgren
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=20190430081408.GB8245@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=venture@google$(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