Skip to contentSkip to conversation

nf-next-2.6.git

DISCUSSION Patrick McHardy 3 participants 7 messages Oct 28, 2008

Subsystems (3)
Networking Network drivers netfilter
lore
Share & tools
lore

Patrick McHardy

author
#0 lore raw

Since Dave has created his net-next-2.6.git tree, I'm now also taking netfilter patches for 2.6.29. The nf-next-2.6.git tree is located at:

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

#1 lore raw
Quoted 5 lines · Patrick McHardy

Since Dave has created his net-next-2.6.git tree, I'm now also taking netfilter patches for 2.6.29. The nf-next-2.6.git tree is located at:

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

Should either or both of git trees be added to
MAINTAINERS: NETFILTER/IPTABLES/IPCHAINS?

T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nft-2.6.git
T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

#2 lore raw
Quoted 9 lines · Joe Perches
Quoted 5 lines · Patrick McHardy

Since Dave has created his net-next-2.6.git tree, I'm now also taking netfilter patches for 2.6.29. The nf-next-2.6.git tree is located at:

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

Should either or both of git trees be added to
MAINTAINERS: NETFILTER/IPTABLES/IPCHAINS?

No. This tree may disappears or reset at times.

author
#3 lore raw
Quoted 7 lines · Jan Engelhardt
Quoted 5 lines · Joe Perches
Quoted 4 lines · Patrick McHardy

Since Dave has created his net-next-2.6.git tree, I'm now also taking netfilter patches for 2.6.29. The nf-next-2.6.git tree is located at:

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

Should either or both of git trees be added to
MAINTAINERS: NETFILTER/IPTABLES/IPCHAINS?

No. This tree may disappears or reset at times.

It won't reset anymore. at least not if avoidable at all. But it will disappear while the networking merge window is closed.

author
#4 lore raw
In reply to Joe Perches
Quoted 5 lines · Joe Perches
Quoted 4 lines · Patrick McHardy

Since Dave has created his net-next-2.6.git tree, I'm now also taking netfilter patches for 2.6.29. The nf-next-2.6.git tree is located at:

Quoted 7 lines
Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

Should either or both of git trees be added to
MAINTAINERS: NETFILTER/IPTABLES/IPCHAINS?

T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nft-2.6.git
T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

The first one is a development tree for something not inside the kernel yet. Adding the second one would be fine.

#5 lore raw
Quoted 8 lines · Patrick McHardy
Quoted 7 lines · Joe Perches
Quoted 5 lines · Patrick McHardy

Since Dave has created his net-next-2.6.git tree, I'm now also taking netfilter patches for 2.6.29. The nf-next-2.6.git tree is located at:

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

Quoted 8 lines
Quoted 5 lines

Should either or both of git trees be added to
MAINTAINERS: NETFILTER/IPTABLES/IPCHAINS?

T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nft-2.6.git
T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

The first one is a development tree for something not inside the kernel yet. Adding the second one would be fine.

I believe you got the order reversed.

This below could/should be added yes?

T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nft-2.6.git

author
#6 lore raw
Quoted 13 lines · Joe Perches
Quoted 12 lines · Patrick McHardy
Quoted 11 lines · Joe Perches
Quoted 5 lines · Patrick McHardy

Since Dave has created his net-next-2.6.git tree, I'm now also taking netfilter patches for 2.6.29. The nf-next-2.6.git tree is located at:

git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

Should either or both of git trees be added to
MAINTAINERS: NETFILTER/IPTABLES/IPCHAINS?

T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nft-2.6.git
T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git

Quoted 8 lines
Quoted 2 lines

The first one is a development tree for something not inside the kernel yet. Adding the second one would be fine.

I believe you got the order reversed.

This below could/should be added yes?

T: git.kernel.org/pub/scm/linux/kernel/git/kaber/nft-2.6.git

No, thats the nftables development tree. That one will reset, rebase etc. and none of the code inside it is merged.

nf-next-2.6.git is the tree I'll regulary ask Dave to merge.