[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20070416.171604.26532491.davem@davemloft.net>
Date: Mon, 16 Apr 2007 17:16:04 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: ilpo.jarvinen@...sinki.fi
Cc: kaber@...sh.net, hch@...radead.org, netdev@...r.kernel.org
Subject: Re: [PATCH net-2.6.22 1/3] [TCP]: Sed magic converts func(sk, tp,
...) -> func(sk, ...)
From: "Ilpo_Järvinen" <ilpo.jarvinen@...sinki.fi>
Date: Mon, 16 Apr 2007 19:19:02 +0300 (EEST)
> [PATCH] [TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)
I was trying to spread out the net-2.6.22 tree from the tcp-2.6
one so that we could do the experimental TCP stuff in the tcp-2.6
tree and leave other networking changes for net-2.6.22
Putting in TCP cleanups which touch a lot of code into net-2.6.22
defeats that effort because now there will be all kinds of rejects and
merge errors people will have to deal with if they clone a net-2.6.22
tree then pull in tcp-2.6 to do some TCP hacking which is valid.
I suppose we can live with that, and just tell people to just pull
tcp-2.6 into a fresh linux-2.6 tree straight, but it's going to make
rebasing difficult for me as well.
net-2.6.22 is already approaching 350 patches, it's a monster and
the merge conflicts and rebasing pain are really getting hard to
deal with.
For example, John Linville probably now has some build failures
to deal with in his wireless-2.6 tree due to Patrick McHardy's
netlink_kernel_create() function signature change today.
Also, the VLAN skb->h.raw bug fix from the other day in mainline
vanilla 2.6 tree is going to cause a build failure I'll have to
fixup next time I rebase, and people will hit that now if they
try to use current linux-2.6.git to pull in the net-2.6.22 tree.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists