linux-next: manual merge of the net tree with the net-current tree

Hi all, Today's linux-next merge of the net tree got a conflict in net/netfilter/ipvs/ip_vs_core.c between commit 8f4e0a18682d ("IPVS netns exit causes crash in conntrack") from the net-current tree and commit 503cf15a5ecc ("IPVS: ...

Message posted on the June 19th, 2011 - 11:00 PM ET

linux-next: build failure after merge of the security-testing tree

Hi James, After merging the security-testing tree, today's linux-next build (powerpc_ppc64_defconfig) failed like this: net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event': net/netfilter/nf_conntrack_netlink.c:585: ...

Message posted on the October 19th, 2010 - 12:00 AM ET

[PATCH] skbuff: update struct sk_buff members comments

Rearrange struct sk_buff members comments to follow their definition order. Also, add missing comments for ooo_okay and dropcount members. Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com> include/linux/skbuff.h | 42 ...

Message posted on the July 8th, 2011 - 9:10 PM ET

Linux 3.0-rc4

Mostly the usual small driver one- (or few-) liners, and some bigger changes to drm (and md). But also two new smallish drivers (net/usb/kalmia.c, and the ADP8870 backlight driver). Some filesystem fixes (btrfs, cifs, afs, xfs, nfsd). And a couple ...

Message posted on the June 21st, 2011 - 12:10 AM ET

next netfilter conntrack