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
Subject: linux-next: pending wireless/wireless-current merge conflict
Date: Wed, 28 May 2008 20:42:51 -0400 [thread overview]
Message-ID: <20080529004251.GD22536@tuxdriver.com> (raw)
In-Reply-To: <20080522134105.GB3996@tuxdriver.com>
I just sent a pull request for Dave that will result in a conflict
in the rt2x00 driver. I have a sample merge available here:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test-2
Please note the 'merge-test-2' -- I still have the old merge-test
there since Dave hadn't (at my last check anyway) yet pulled the
previous wireless-next-2.6 request into net-next-2.6.
Just a heads-up... :-)
John
--
John W. Linville
linville@tuxdriver.com
next prev parent reply other threads:[~2008-05-29 0:58 UTC|newest]
Thread overview: 12+ 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
2008-05-22 23:34 ` Stephen Rothwell
2008-05-23 3:37 ` Stephen Rothwell
2008-05-29 0:42 ` John W. Linville [this message]
2008-05-29 1:44 ` linux-next: pending " Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-06-13 21:56 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
2008-06-26 3:15 ` Stephen Rothwell
2008-06-28 8:29 ` David Miller
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=20080529004251.GD22536@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.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.