* linux-next: manual merge of the driver-core tree with the x86 tree
@ 2009-06-03 7:18 Stephen Rothwell
2009-06-03 14:59 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-06-03 7:18 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Kay Sievers, Jan Blunck,
Dmitry Adamushko, Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
arch/x86/kernel/microcode_core.c between commit
871b72dd1e12afc3f024479531d25a9339d2e3f9 ("x86: microcode: use
smp_call_function_single instead of set_cpus_allowed, cleanup of
synchronization logic") from the x86 tree and commit
3b5f472624ad5b54753388bb3c563a8f308eed88 ("Driver Core: misc: add
nodename support for misc devices") from the driver-core tree.
Just white space changes overlapping an addition. I fixed it up (see
below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/x86/kernel/microcode_core.c
index 9c44615,75bb914..0000000
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@@ -234,9 -171,10 +234,10 @@@ static const struct file_operations mic
};
static struct miscdevice microcode_dev = {
- .minor = MICROCODE_MINOR,
- .name = "microcode",
- .devnode = "cpu/microcode",
- .fops = µcode_fops,
+ .minor = MICROCODE_MINOR,
+ .name = "microcode",
++ .devnode = "cpu/microcode",
+ .fops = µcode_fops,
};
static int __init microcode_dev_init(void)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the x86 tree
2009-06-03 7:18 linux-next: manual merge of the driver-core tree with the x86 tree Stephen Rothwell
@ 2009-06-03 14:59 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2009-06-03 14:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Kay Sievers, Jan Blunck,
Dmitry Adamushko, Thomas Gleixner, Ingo Molnar, H. Peter Anvin
On Wed, Jun 03, 2009 at 05:18:30PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/x86/kernel/microcode_core.c between commit
> 871b72dd1e12afc3f024479531d25a9339d2e3f9 ("x86: microcode: use
> smp_call_function_single instead of set_cpus_allowed, cleanup of
> synchronization logic") from the x86 tree and commit
> 3b5f472624ad5b54753388bb3c563a8f308eed88 ("Driver Core: misc: add
> nodename support for misc devices") from the driver-core tree.
>
> Just white space changes overlapping an addition. I fixed it up (see
> below) and can carry the fix as necessary.
Thanks, I'll watch for this when merging with Linus.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-03 15:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-03 7:18 linux-next: manual merge of the driver-core tree with the x86 tree Stephen Rothwell
2009-06-03 14:59 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox