From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
To: sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
Cc: linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org,
linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08
Date: Tue, 08 Jul 2008 16:44:35 -0700 (PDT) [thread overview]
Message-ID: <20080708.164435.141370914.davem@davemloft.net> (raw)
In-Reply-To: <20080709094037.8e3050d9.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Date: Wed, 9 Jul 2008 09:40:37 +1000
> Hi John,
>
> On Tue, 8 Jul 2008 16:30:44 -0400 "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org> 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.
I just merged net-2.6 into net-next-2.6 and sorted all of the
merge issues out, so I hope you won't bump into anything :)
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2008-07-08 23:44 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
[not found] ` <20080709094037.8e3050d9.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2008-07-08 23:44 ` David Miller [this message]
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=20080708.164435.141370914.davem@davemloft.net \
--to=davem-ft/pcqaiutieiz0/mpfg9q@public.gmane.org \
--cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org \
--cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org \
/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).