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,
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: Re: linux-next: manual merge of the driver-core tree with the x86 tree
Date: Wed, 3 Jun 2009 07:59:01 -0700 [thread overview]
Message-ID: <20090603145901.GB30890@kroah.com> (raw)
In-Reply-To: <20090603171830.b2f80b02.sfr@canb.auug.org.au>
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
prev parent reply other threads:[~2009-06-03 15:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20090603145901.GB30890@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=dmitry.adamushko@gmail$(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=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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