* linux-next: pending wireless/wireless-current merge conflict 2008-07-02
@ 2008-07-02 22:02 John W. Linville
2008-07-08 20:30 ` linux-next: pending wireless/wireless-current merge conflict 2008-07-08 John W. Linville
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2008-07-02 22:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, linux-next, linux-wireless
I just sent a pull request for Dave that will result in a merge
conflict with 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
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: pending wireless/wireless-current merge conflict 2008-07-08
2008-07-02 22:02 linux-next: pending wireless/wireless-current merge conflict 2008-07-02 John W. Linville
@ 2008-07-08 20:30 ` John W. Linville
2008-07-08 23:40 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2008-07-08 20:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, linux-next, linux-wireless
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"... :-)
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08
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>
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2008-07-08 23:40 UTC (permalink / raw)
To: John W. Linville; +Cc: David Miller, linux-next, linux-wireless
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08
[not found] ` <20080709094037.8e3050d9.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
@ 2008-07-08 23:44 ` David Miller
2008-07-08 23:47 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2008-07-08 23:44 UTC (permalink / raw)
To: sfr-3FnU+UHB4dNDw9hX6IcOSA
Cc: linville-2XuSBdqkA4R54TAoqtyWWQ,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08
2008-07-08 23:44 ` David Miller
@ 2008-07-08 23:47 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2008-07-08 23:47 UTC (permalink / raw)
To: David Miller; +Cc: linville, linux-next, linux-wireless
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
Hi Dave,
On Tue, 08 Jul 2008 16:44:35 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> 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 :)
Excellent - I just decided to do one last fetch before building today's
tree :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-07-08 23:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2008-07-08 23:47 ` Stephen Rothwell
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).