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,
Russell King <rmk@arm.linux.org.uk>,
Kay Sievers <kay.sievers@vrfy.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the arm tree
Date: Wed, 4 Jan 2012 15:08:31 -0800 [thread overview]
Message-ID: <20120104230831.GH24583@kroah.com> (raw)
In-Reply-To: <20111228163545.7034aa9b783d46ac4b46c545@canb.auug.org.au>
On Wed, Dec 28, 2011 at 04:35:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s5pv210/common.c between commit 37775320458e ("ARM: 7252/1:
> restart: S5PV210: use new restart hook") from the arm tree and commit
> 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
> the driver-core tree (where it is called arch/arm/mach-s5pv210/cpu.c).
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2012-01-04 23:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 5:35 linux-next: manual merge of the driver-core tree with the arm tree Stephen Rothwell
2012-01-04 23:08 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-01-06 6:57 Stephen Rothwell
2012-01-06 7:13 ` Kukjin Kim
2012-01-06 6:52 Stephen Rothwell
2012-01-06 7:08 ` Kukjin Kim
2012-01-06 19:20 ` 'Greg KH'
2011-12-28 5:40 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2011-12-28 5:12 Stephen Rothwell
2011-12-28 5:24 ` Stephen Rothwell
2012-01-04 23:09 ` 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=20120104230831.GH24583@kroah.com \
--to=greg@kroah.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).