From: Matthew Garrett <mjg@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Johannes Berg <johannes@sipsolutions•net>,
Len Brown <lenb@kernel•org>
Subject: Re: linux-next: manual merge of the wireless tree with the acpi tree
Date: Wed, 3 Jun 2009 04:03:21 +0100 [thread overview]
Message-ID: <20090603030321.GB28009@srcf.ucam.org> (raw)
In-Reply-To: <20090603122046.6aa99d91.sfr@canb.auug.org.au>
On Wed, Jun 03, 2009 at 12:20:46PM +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/platform/x86/Kconfig between commit
> eedd8dca3c0e6c1fcb5cba11321ea9d69917d85b ("eeepc-laptop: Register as a
> pci-hotplug device") from the acpi tree and commit
> c6d660ce29295d344fcdc3654274b4a0aad1a9c8 ("rfkill: rewrite") from the
> wireless tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Patch looks fine.
--
Matthew Garrett | mjg59@srcf•ucam.org
next prev parent reply other threads:[~2009-06-03 3:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-03 2:20 linux-next: manual merge of the wireless tree with the acpi tree Stephen Rothwell
2009-06-03 3:03 ` Matthew Garrett [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-03 2:27 Stephen Rothwell
2009-06-03 3:05 ` Matthew Garrett
2009-06-03 4:42 ` Stephen Rothwell
2009-06-18 1:29 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=20090603030321.GB28009@srcf.ucam.org \
--to=mjg@redhat$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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