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,
Andi Kleen <ak@linux.intel.com>, Len Brown <lenb@kernel.org>,
Thomas Renninger <trenn@suse.de>, Len Brown <len.brown@intel.com>
Subject: Re: linux-next: manual merge of the driver-core tree with Linus' tree
Date: Thu, 2 Feb 2012 11:26:39 -0800 [thread overview]
Message-ID: <20120202192639.GA5798@kroah.com> (raw)
In-Reply-To: <20120130023517.GA7937@kroah.com>
On Sun, Jan 29, 2012 at 06:35:17PM -0800, Greg KH wrote:
> On Mon, Jan 30, 2012 at 01:24:51PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/acpi/processor_driver.c between commit 54d5dcc45af7 ("ACPI
> > processor hotplug: Split up acpi_processor_add") from Linus' tree and
> > commit 9061e0e16700 ("ACPI: Load acpi-cpufreq from processor driver
> > automatically") from the driver-core tree.
> >
> > I fixed it up (I think- see below) and can carry the fix as necessary.
>
> Thanks, I'll merge the driver-core next tree when 3.3-rc2 is out to
> resolve this problem.
This should now be resolved.
thanks,
greg k-h
next prev parent reply other threads:[~2012-02-02 19:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 2:24 linux-next: manual merge of the driver-core tree with Linus' tree Stephen Rothwell
2012-01-30 2:35 ` Greg KH
2012-02-02 19:26 ` 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
2011-12-28 5:28 Stephen Rothwell
2012-01-04 23:08 ` 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=20120202192639.GA5798@kroah.com \
--to=greg@kroah.com \
--cc=ak@linux.intel.com \
--cc=len.brown@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=trenn@suse.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.