net-2.6 being rebased...

net-2.6 being rebased...

[David Miller]

Because of the bugs in Adam's MD5/SACK fix I need to rebase
the tree to get rid of it.  Adam, please post a complete
new patch once you've fixed that SACK option adding problem.
Thanks.


The only other local change in net-2.6 is Dave Young's bluetooth
deadlock fix which I'll put into the rebased tree.

I hate to do this but:

1) I didn't pull any of this into net-next-2.6 yet, so it
   hasn't propagated there.

2) I don't want Adam's buggy change holding back my ability
   to push bug fixes to Linus.

Sorry, but it's necessary.

I'll post a reply to this after the rebase is complete.

Re: net-2.6 being rebased...

[Adam Langley]

On Tue, Jun 3, 2008 at 2:24 PM, David Miller <davem@davemloft.net> wrote:
> Because of the bugs in Adam's MD5/SACK fix I need to rebase
> the tree to get rid of it.  Adam, please post a complete
> new patch once you've fixed that SACK option adding problem.
> Thanks.

I'm just finishing up a proposed fix if you want to hold off.


AGL

Re: net-2.6 being rebased...

[David Miller]

From: "Adam Langley" <agl@imperialviolet.org>
Date: Tue, 3 Jun 2008 14:27:34 -0700

> On Tue, Jun 3, 2008 at 2:24 PM, David Miller <davem@davemloft.net> wrote:
> > Because of the bugs in Adam's MD5/SACK fix I need to rebase
> > the tree to get rid of it.  Adam, please post a complete
> > new patch once you've fixed that SACK option adding problem.
> > Thanks.
> 
> I'm just finishing up a proposed fix if you want to hold off.

It's better to have only a working fix in there.  But thanks anyways.

Re: net-2.6 being rebased...

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Tue, 03 Jun 2008 14:24:07 -0700 (PDT)

> I'll post a reply to this after the rebase is complete.

The rebase of net-2.6 is complete, thanks for your understanding.

Re: net-2.6 being rebased...

[Jeff Garzik]

David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Tue, 03 Jun 2008 14:24:07 -0700 (PDT)
> 
>> I'll post a reply to this after the rebase is complete.
> 
> The rebase of net-2.6 is complete, thanks for your understanding.

Thanks for warning us, and thanks for helping to make sure rebases are 
now a rare event.

Cheers and enjoy your travels,

	Jeff

Re: net-2.6 being rebased...

[Adam Langley]

On Tue, Jun 3, 2008 at 2:28 PM, David Miller <davem@davemloft.net> wrote:
> The rebase of net-2.6 is complete, thanks for your understanding.

I should apologise for this. I don't know the TCP stack well enough
(obviously); I just sought to highlight a bug that I saw when I was
hacking around for one of my own pet projects.

I'll send a v2 patch in a second which should contain all the first,
plus fixes at all the other places I can find that the contents of the
header are calculated. (I've tested it between a couple of KVM
instances, which is all the testing ability I have at the moment). You
may well want to drop it and wait until someone competent comes along
to fix it.


-- 
Adam Langley agl@imperialviolet.org http://www.imperialviolet.org

net-2.6 being rebased...

[David Miller]

I have to do this to get rid of the ax25/netrom changes from Alan I
applied yesterday.

Better to do it now on new trees rather than ones that have been in
use and propagated for months, right? :-)

Again, sorry for any inconvenience this may cause.

Re: net-2.6 being rebased...

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Fri, 27 Mar 2009 15:11:51 -0700 (PDT)

> 
> I have to do this to get rid of the ax25/netrom changes from Alan I
> applied yesterday.
> 
> Better to do it now on new trees rather than ones that have been in
> use and propagated for months, right? :-)
> 
> Again, sorry for any inconvenience this may cause.

It actually turned out that I didn't need to rebase, Alan was
talking about some other older patches he objected to.

I blew away the master.kernel.org trees before I figured that out.

However I think I rebuilt them in such a way that you can still
pull cleanly from them if you had the tree that was there before.

Let me know if there are any problems, sorry for all the confusion.