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,
Josh Triplett <josh@joshtriplett.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Kay Sievers <kay.sievers@vrfy.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the tip tree
Date: Wed, 4 Jan 2012 14:52:20 -0800 [thread overview]
Message-ID: <20120104225220.GA24583@kroah.com> (raw)
In-Reply-To: <20111228155707.f4554d3d6b624189e4216aed@canb.auug.org.au>
On Wed, Dec 28, 2011 at 03:57:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/cpu.h between commit 2987557f52b9 ("driver-core/cpu: Expose
> hotpluggability to the rest of the kernel") from the tip tree and commit
> 8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' 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: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-28 4:57 linux-next: manual merge of the driver-core tree with the tip tree Stephen Rothwell
2012-01-04 22:52 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 4:24 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2013-04-11 5:30 Stephen Rothwell
2013-04-11 13:26 ` Greg KH
2014-03-13 0:07 Mark Brown
2014-07-31 7:07 Stephen Rothwell
2014-08-01 0:20 ` Greg KH
2014-08-01 23:38 ` Kees Cook
2014-08-02 2:40 ` Greg KH
2014-08-04 18:27 ` John Stultz
2025-11-17 5:21 Stephen Rothwell
2025-11-17 21:29 ` Boqun Feng
2025-11-17 5:30 Stephen Rothwell
2025-11-17 21:34 ` Boqun Feng
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=20120104225220.GA24583@kroah.com \
--to=greg@kroah.com \
--cc=hpa@zytor.com \
--cc=josh@joshtriplett.org \
--cc=kay.sievers@vrfy.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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.