From: Zhu Yi <yi.zhu@intel.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
linux-next@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: linux-next: pending wireless/wireless-current merge conflict
Date: Thu, 26 Jun 2008 10:01:59 +0800 [thread overview]
Message-ID: <1214445720.14590.285.camel@debian.sh.intel.com> (raw)
In-Reply-To: <20080625180430.GA13730@tuxdriver.com>
On Wed, 2008-06-25 at 14:04 -0400, John W. Linville wrote:
> 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...
I checked the patch on the tip of wireless-testing is good. I think
wireless-next-2.6:merge-test should also be OK.
Thanks,
-yi
next prev parent reply other threads:[~2008-06-26 2:03 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
2008-06-26 2:01 ` Zhu Yi [this message]
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=1214445720.14590.285.camel@debian.sh.intel.com \
--to=yi.zhu@intel.com \
--cc=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--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.