From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
linux-next@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: linux-next: pending wireless/wireless-current merge conflict
Date: Wed, 25 Jun 2008 14:04:30 -0400 [thread overview]
Message-ID: <20080625180430.GA13730@tuxdriver.com> (raw)
In-Reply-To: <20080613215601.GA8345@tuxdriver.com>
I just sent a pull request for Dave that will result in nasty-looking
conflict in iwl4965-base.c. I have a sample merge available here:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
The overview of the resolution is to ignore any changes in
iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from
the URL above.
Just a heads-up... :-)
John
P.S. Hopefully the iwlwifi guys will double check the accuracy of
my fix-up...
--
John W. Linville
linville@tuxdriver.com
next prev parent reply other threads:[~2008-06-25 18:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-13 21:56 linux-next: pending wireless/wireless-current merge conflict John W. Linville
2008-06-14 1:31 ` Stephen Rothwell
2008-06-25 18:04 ` John W. Linville [this message]
2008-06-26 2:01 ` Zhu Yi
2008-06-26 3:15 ` Stephen Rothwell
2008-06-26 5:40 ` linux-next: manual merge of the net tree Stephen Rothwell
2008-06-26 5:54 ` David Miller
2008-06-26 6:58 ` Stephen Rothwell
2008-06-26 9:08 ` David Miller
2008-06-28 8:29 ` linux-next: pending wireless/wireless-current merge conflict David Miller
-- strict thread matches above, loose matches on Subject: below --
2008-05-22 3:20 linux-next: " Stephen Rothwell
2008-05-22 13:41 ` John W. Linville
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=20080625180430.GA13730@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).