From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kay Sievers <kay.sievers@vrfy•org>,
Thomas Abraham <thomas.abraham@linaro•org>,
Kukjin Kim <kgene.kim@samsung•com>
Subject: Re: linux-next: manual merge of the driver-core tree with the s5p tree
Date: Wed, 4 Jan 2012 14:52:31 -0800 [thread overview]
Message-ID: <20120104225231.GB24583@kroah.com> (raw)
In-Reply-To: <20111228160045.21ef706d279fef338ac5d7e0@canb.auug.org.au>
On Wed, Dec 28, 2011 at 04:00:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-exynos/cpu.c between commit f983575aa90c ("ARM: EXYNOS:
> Enable conversion of GIC dt irq specifier to linux virq") from the s5p
> tree and commit 4a858cfc9af8 ("arm: convert sysdev_class to a regular
> subsystem") from the driver-core tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks fine, thanks.
greg k-h
next prev parent reply other threads:[~2012-01-04 23:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 5:00 linux-next: manual merge of the driver-core tree with the s5p tree Stephen Rothwell
2012-01-04 22:52 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-12-28 5:05 Stephen Rothwell
2012-01-04 22:52 ` 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=20120104225231.GB24583@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thomas.abraham@linaro$(echo .)org \
/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