linux-next: pending wireless/wireless-current merge conflict 2008-07-02

linux-next: pending wireless/wireless-current merge conflict 2008-07-02

[John W. Linville]

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

linux-next: pending wireless/wireless-current merge conflict 2008-07-08

[John W. Linville]

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

Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08

[David Miller]

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

Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 9 Jul 2008 09:40:37 +1000

> 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.

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 :)

Re: linux-next: pending wireless/wireless-current merge conflict 2008-07-08

[Stephen Rothwell]

[-- 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 --]