From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: 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 2008-07-08
Date: Wed, 9 Jul 2008 09:40:37 +1000 [thread overview]
Message-ID: <20080709094037.8e3050d9.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080708203044.GA6381@tuxdriver.com>
[-- Attachment #1: Type: text/plain, Size: 650 bytes --]
Hi John,
On Tue, 8 Jul 2008 16:30:44 -0400 "John W. Linville" <linville@tuxdriver•com> wrote:
>
> I just sent a pull request for Dave that will result in a merge
> conflict in linux-next. I have a sample merge available here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
>
> Just a heads-up... :-)
>
> John
>
> P.S. These are one-liners (including the one from yesterday).
> Nevertheless, it can't hurt to provide a reference "just in
> case"... :-)
Appreciated, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-08 23:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-02 22:02 linux-next: pending wireless/wireless-current merge conflict 2008-07-02 John W. Linville
2008-07-08 20:30 ` linux-next: pending wireless/wireless-current merge conflict 2008-07-08 John W. Linville
2008-07-08 23:40 ` Stephen Rothwell [this message]
[not found] ` <20080709094037.8e3050d9.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2008-07-08 23:44 ` David Miller
2008-07-08 23:47 ` 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=20080709094037.8e3050d9.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
/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