linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Thomas Renninger <trenn@suse.de>
Subject: linux-next: manual merge of the driver-core tree with the driver-core.current tree
Date: Fri, 3 Feb 2012 14:51:06 +1100	[thread overview]
Message-ID: <20120203145106.3c166564b7081d94ee2e79cd@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1022 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/cpu.c between commit 2885e25c422f ("driver core: cpu: remove
kernel warning when removing a cpu") from the driver-core.current tree
and commit fad12ac8c8c2 ("CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86
parts") from the driver-core tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/cpu.c
index 23f2c4c,2a0c670..0000000
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@@ -242,7 -224,9 +243,10 @@@ int __cpuinit register_cpu(struct cpu *
  	cpu->node_id = cpu_to_node(num);
  	cpu->dev.id = num;
  	cpu->dev.bus = &cpu_subsys;
 +	cpu->dev.release = cpu_device_release;
+ #ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
+ 	cpu->dev.bus->uevent = arch_cpu_uevent;
+ #endif
  	error = device_register(&cpu->dev);
  	if (!error && cpu->hotpluggable)
  		register_cpu_control(cpu);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-02-03  3:51 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-03  3:51 Stephen Rothwell [this message]
2012-02-03 15:07 ` linux-next: manual merge of the driver-core tree with the driver-core.current tree Greg KH
2013-06-19  5:32 Stephen Rothwell
2013-06-19  5:55 ` Greg KH
2013-06-19  6:58 ` Ming Lei
2013-06-19 14:39   ` Greg KH
2013-06-19 15:04     ` Ming Lei
2013-06-19 16:36       ` Greg KH
2013-06-20  0:23         ` Ming Lei
2013-06-20  1:06           ` Stephen Rothwell
2013-06-20  1:22             ` Ming Lei
2013-06-20  3:28               ` Greg KH
2013-06-20  3:46                 ` Ming Lei
2013-06-20  3:49                 ` Stephen Rothwell
2013-06-19  7:12 ` Stephen Rothwell
2013-06-19  7:21   ` Ming Lei
2013-12-09  3:47 Stephen Rothwell
2013-12-09  8:21 ` Greg KH
2020-04-30  4:25 Stephen Rothwell
2020-04-30  8:15 ` 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=20120203145106.3c166564b7081d94ee2e79cd@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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 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).