public inbox for linux-next@vger.kernel.org 
 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,
	Kay Sievers <kay.sievers@vrfy•org>, Jan Blunck <jblunck@suse•de>,
	Dmitry Adamushko <dmitry.adamushko@gmail•com>,
	Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
	"H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the driver-core tree with the x86 tree
Date: Wed, 3 Jun 2009 17:18:30 +1000	[thread overview]
Message-ID: <20090603171830.b2f80b02.sfr@canb.auug.org.au> (raw)

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		= &microcode_fops,
 +	.minor			= MICROCODE_MINOR,
 +	.name			= "microcode",
++	.devnode		= "cpu/microcode",
 +	.fops			= &microcode_fops,
  };
  
  static int __init microcode_dev_init(void)

next             reply	other threads:[~2009-06-03  7:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-03  7:18 Stephen Rothwell [this message]
2009-06-03 14:59 ` linux-next: manual merge of the driver-core tree with the x86 tree 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=20090603171830.b2f80b02.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=dmitry.adamushko@gmail$(echo .)com \
    --cc=greg@kroah$(echo .)com \
    --cc=hpa@zytor$(echo .)com \
    --cc=jblunck@suse$(echo .)de \
    --cc=kay.sievers@vrfy$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mingo@elte$(echo .)hu \
    --cc=tglx@linutronix$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox