From: Johannes Berg <johannes@sipsolutions•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver•com>,
linux-next@vger•kernel.org, Greg KH <greg@kroah•com>
Subject: Re: linux-next: manual merge of the wireless tree
Date: Wed, 17 Sep 2008 09:45:20 +0200 [thread overview]
Message-ID: <1221637520.9262.37.camel@johannes.berg> (raw)
In-Reply-To: <20080917174317.a5335e6c.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
On Wed, 2008-09-17 at 17:43 +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/mac80211_hwsim.c between commit
> 121e2082a81c7988a1399c1a5f43795c95225de2 ("device create: net: convert
> device_create_drvdata to device_create") from the driver-core tree and
> commit init_mac80211_hwsim( ("mac80211 hwsim: make radio list dynamic")
> from the wireless tree.
>
> The former modified the context of the latter. I fixed it up (see below)
> and can carry the fix.
Looks fine to me, thanks.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2008-09-17 7:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-17 7:43 linux-next: manual merge of the wireless tree Stephen Rothwell
2008-09-17 7:45 ` Johannes Berg [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-26 8:40 Stephen Rothwell
2008-12-02 20:52 ` Luis R. Rodriguez
2008-11-20 3:07 Stephen Rothwell
2008-11-20 8:27 ` David Miller
2008-11-20 13:48 ` John W. Linville
2008-07-03 4:43 Stephen Rothwell
2008-07-03 4:38 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=1221637520.9262.37.camel@johannes.berg \
--to=johannes@sipsolutions$(echo .)net \
--cc=greg@kroah$(echo .)com \
--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