From: David Miller <davem@davemloft.net> Date: 2011-03-15 23:00:46
Please do not submit feature patches until the merge window is over and
Linus releases 2.6.39-rc1, thank you.
Bug fixes are, of course, still ok.
I have merged all of the stragglers from net-2.6 that didn't make it
into 2.6.38 into net-next-2.6, and also just about everything that
is relevant from patchwork.
Jiri, I know there is your patch set there, but I think you and Changli
still need to go back and forth one more time wrt. orig_dev semantics.
Since you have been posting this patch set for some time I'm still
willing to apply it for this merge window, but please make haste and
work out the remaining discussion. Thank you.
Eric, I'd like to have the ECN one-liner in the tree soon.
John and Patrick, I assume that after today's pulls I am completely
up to date with everything, feature wise, that will go into the merge
window for wireless and netfilter.
Thanks.
Jiri, I know there is your patch set there, but I think you and Changli
still need to go back and forth one more time wrt. orig_dev semantics.
Since you have been posting this patch set for some time I'm still
willing to apply it for this merge window, but please make haste and
work out the remaining discussion. Thank you.
Dave, you can apply the rest of the series and leave only the first
patch (af_packet) out. There's no dependency. We will figure out things
around origdev later.
Thanks.
Jirka
Jiri, I know there is your patch set there, but I think you and Changli
still need to go back and forth one more time wrt. orig_dev semantics.
Since you have been posting this patch set for some time I'm still
willing to apply it for this merge window, but please make haste and
work out the remaining discussion. Thank you.
Dave, you can apply the rest of the series and leave only the first
patch (af_packet) out. There's no dependency. We will figure out things
around origdev later.
I was about to do that but I've found other problems.
You cannot make the modifications you make to linux/if.h, those
interface flags are visible to userspace.
Jiri, I know there is your patch set there, but I think you and Changli
still need to go back and forth one more time wrt. orig_dev semantics.
Since you have been posting this patch set for some time I'm still
willing to apply it for this merge window, but please make haste and
work out the remaining discussion. Thank you.
Dave, you can apply the rest of the series and leave only the first
patch (af_packet) out. There's no dependency. We will figure out things
around origdev later.
I was about to do that but I've found other problems.
You cannot make the modifications you make to linux/if.h, those
interface flags are visible to userspace.
What do you suggest? To remove unused flags and leave gaps there or to
not to remove the flags at all?
Thanks.
Jirka