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>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: linux-next: manual merge of the driver-core tree with Linus' tree
Date: Wed, 4 Jan 2012 15:08:56 -0800 [thread overview]
Message-ID: <20120104230856.GI24583@kroah.com> (raw)
In-Reply-To: <20111228162859.50b53b23e90ccf0145f2945a@canb.auug.org.au>
On Wed, Dec 28, 2011 at 04:28:59PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-s3c64xx/s3c6400.c between commit 71b33a4f7c86 ("ARM:
> S3C64XX: Staticise s3c6400_sysclass") from Linus' tree and commit
> 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
> the driver-core tree.
>
> The latter subsumed the change in the former, so I used that.
That sounds correct, thanks.
greg k-h
next prev parent reply other threads:[~2012-01-04 23:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 5:28 linux-next: manual merge of the driver-core tree with Linus' tree Stephen Rothwell
2012-01-04 23:08 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-12-05 3:20 Stephen Rothwell
2025-12-05 3:26 ` Miguel Ojeda
2025-12-05 4:01 ` Stephen Rothwell
2015-08-07 5:26 Stephen Rothwell
2015-08-07 5:30 ` Viresh Kumar
2014-12-15 3:09 Stephen Rothwell
2013-01-23 4:15 Stephen Rothwell
2013-01-23 4:42 ` Greg KH
2012-05-01 5:01 Stephen Rothwell
2012-05-01 13:46 ` Greg KH
2012-05-04 23:19 ` Greg KH
2012-01-30 2:24 Stephen Rothwell
2012-01-30 2:35 ` Greg KH
2012-02-02 19:26 ` Greg KH
2010-01-18 7:49 Stephen Rothwell
2010-01-19 20:59 ` Greg KH
2010-01-19 23:43 ` 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=20120104230856.GI24583@kroah.com \
--to=greg@kroah.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.