Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NetLabel]: update docs with website information [NetLabel]: rework the Netlink attribute handling (part 2) [NetLabel]: rework the Netlink attribute handling (part 1) [Netlink]: add nla_validate_nested() [NETLINK]: add nla_for_each_nested() to the interface list [NetLabel]: change the SELinux permissions [NetLabel]: make the CIPSOv4 cache spinlocks bottom half safe [NetLabel]: correct improper handling of non-NetLabel peer contexts [TCP]: make cubic the default [TCP]: default congestion control menu [ATM] he: Fix __init/__devinit conflict [NETFILTER]: Add dscp,DSCP headers to header-y [DCCP]: Introduce dccp_probe [DCCP]: Use constants for CCIDs [DCCP]: Introduce constants for CCID numbers [DCCP]: Allow default/fallback service code.
Showing
- Documentation/networking/dccp.txt 5 additions, 3 deletionsDocumentation/networking/dccp.txt
- MAINTAINERS 7 additions, 0 deletionsMAINTAINERS
- drivers/atm/he.c 8 additions, 8 deletionsdrivers/atm/he.c
- include/linux/dccp.h 8 additions, 6 deletionsinclude/linux/dccp.h
- include/linux/netfilter/Kbuild 2 additions, 0 deletionsinclude/linux/netfilter/Kbuild
- include/net/cipso_ipv4.h 14 additions, 9 deletionsinclude/net/cipso_ipv4.h
- include/net/netlabel.h 10 additions, 47 deletionsinclude/net/netlabel.h
- include/net/netlink.h 20 additions, 0 deletionsinclude/net/netlink.h
- net/dccp/Kconfig 16 additions, 0 deletionsnet/dccp/Kconfig
- net/dccp/Makefile 2 additions, 0 deletionsnet/dccp/Makefile
- net/dccp/ccids/ccid2.c 1 addition, 1 deletionnet/dccp/ccids/ccid2.c
- net/dccp/ccids/ccid3.c 1 addition, 1 deletionnet/dccp/ccids/ccid3.c
- net/dccp/ipv4.c 0 additions, 3 deletionsnet/dccp/ipv4.c
- net/dccp/probe.c 198 additions, 0 deletionsnet/dccp/probe.c
- net/dccp/proto.c 1 addition, 10 deletionsnet/dccp/proto.c
- net/ipv4/Kconfig 44 additions, 9 deletionsnet/ipv4/Kconfig
- net/ipv4/cipso_ipv4.c 65 additions, 202 deletionsnet/ipv4/cipso_ipv4.c
- net/ipv4/sysctl_net_ipv4.c 6 additions, 0 deletionsnet/ipv4/sysctl_net_ipv4.c
- net/ipv4/tcp_cong.c 1 addition, 1 deletionnet/ipv4/tcp_cong.c
- net/netlabel/Kconfig 4 additions, 1 deletionnet/netlabel/Kconfig
Loading
Please register or sign in to comment