You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David		14 years ago
..
Kconfig	sctp: implement sctp association probing module	15 years ago
Makefile	sctp: implement sctp association probing module	15 years ago
associola.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
auth.c	sctp: Fix out-of-bounds reading in sctp_asoc_get_hmac()	15 years ago
bind_addr.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
chunk.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
command.c	[SCTP]: Remove sctp_add_cmd_sf wrapper bloat	17 years ago
debug.c	net: mark read-only arrays as const	16 years ago
endpointola.c	Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev	15 years ago
input.c	sctp: Fix a race between ICMP protocol unreachable and connect()	15 years ago
inqueue.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
ipv6.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
objcnt.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
output.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
outqueue.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
primitive.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
probe.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	14 years ago
proc.c	net: Remove unnecessary returns from void function()s	15 years ago
protocol.c	net: return operator cleanup	15 years ago
sm_make_chunk.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
sm_sideeffect.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
sm_statefuns.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
sm_statetable.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
socket.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
ssnmap.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
sysctl.c	sctp: fix compile error due to sysctl mismerge	15 years ago
transport.c	net/sctp: Use pr_fmt and pr_<level>	15 years ago
tsnmap.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ulpevent.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ulpqueue.c	net: Remove unnecessary returns from void function()s	15 years ago