From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Johannes Berg <johannes@sipsolutions.net>,
linux-next@vger.kernel.org, Helmut Schaa <hschaa@suse.de>
Subject: Re: linux-next: wireless/wireless-current merge conflict
Date: Thu, 22 May 2008 09:41:05 -0400 [thread overview]
Message-ID: <20080522134105.GB3996@tuxdriver.com> (raw)
In-Reply-To: <20080522132031.3c05b6f7.sfr@canb.auug.org.au>
On Thu, May 22, 2008 at 01:20:31PM +1000, Stephen Rothwell wrote:
> Hi John, Dave,
>
> Today's linux-next merge of the net tree got a (trivial) conflict in
> net/mac80211/mlme.c between commit
> 0d580a774b3682b8b2b5c89ab9b813d149ef28e7 ("mac80211: fix NULL pointer
> dereference in ieee80211_compatible_rates") from the wireless-current
> tree and commit 988c0f723d0b1abb399e6e71d8bf3f8bf1949a70 ("mac80211: a
> few code cleanups") from the wireless tree.
>
> The conflict is just contextual with the latter patch removing braces
> around some code very near the insertion in the former patch. I did the
> obvious fixup. You may want to check (around line 724).
It sounds like you did the right fix. Did you hit one under
drivers/net/wireless/libertas as well?
I have just pushed a 'merge-test' branch here:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
You may wish to refer to it for the libertas conflict tomorrow.
John
--
John W. Linville
linville@tuxdriver.com
next prev parent reply other threads:[~2008-05-22 13:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-22 3:20 linux-next: wireless/wireless-current merge conflict Stephen Rothwell
2008-05-22 13:41 ` John W. Linville [this message]
2008-05-22 23:34 ` Stephen Rothwell
2008-05-23 3:37 ` Stephen Rothwell
2008-05-29 0:42 ` linux-next: pending " John W. Linville
2008-05-29 1:44 ` 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=20080522134105.GB3996@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=hschaa@suse.de \
--cc=johannes@sipsolutions.net \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.