From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Pratik Patel <pratikp@codeaurora•org>
Subject: Re: linux-next: manual merge of the char-misc tree with the staging tree
Date: Mon, 10 Nov 2014 14:58:05 +0900 [thread overview]
Message-ID: <20141110055805.GA28761@kroah.com> (raw)
In-Reply-To: <20141110165316.5c122b47@canb.auug.org.au>
On Mon, Nov 10, 2014 at 04:53:16PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/Makefile between commit 777783e0abae ("staging: android:
> binder: move to the "real" part of the kernel") from the staging tree and
> commit a06ae8609b3d ("coresight: add CoreSight core layer framework")
> from the char-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc drivers/Makefile
> index 60d19820a4d4,628b512b625b..000000000000
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@@ -161,4 -161,4 +161,5 @@@ obj-$(CONFIG_POWERCAP) += powercap
> obj-$(CONFIG_MCB) += mcb/
> obj-$(CONFIG_RAS) += ras/
> obj-$(CONFIG_THUNDERBOLT) += thunderbolt/
> +obj-$(CONFIG_ANDROID) += android/
> + obj-$(CONFIG_CORESIGHT) += coresight/
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2014-11-10 6:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 5:53 linux-next: manual merge of the char-misc tree with the staging tree Stephen Rothwell
2014-11-10 5:58 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-02-16 2:55 Stephen Rothwell
2016-02-23 1:36 ` Greg KH
2016-02-16 3:00 Stephen Rothwell
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=20141110055805.GA28761@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pratikp@codeaurora$(echo .)org \
--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