Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [CRYPTO] users: Fix up scatterlist conversion errors [CRYPTO] tcrypt: Move sg_init_table out of timing loops [NETNS]: Fix get_net_ns_by_pid [NET]: Marking struct pernet_operations __net_initdata was inappropriate [INET] ESP: Must #include <linux/scatterlist.h> [TCP] IPV6: fix softnet build breakage
2026-09-26 18:16:26 +00:00 · 2007-10-27 10:10:40 -07:00 · 2007-10-27 10:10:40 -07:00 · 0f5a2c553d
commit 0f5a2c553d
parent 26adc0d585 68e3f5dd4d
22 changed files with 118 additions and 76 deletions
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
--- a/drivers/net/ppp_mppe.c
+++ b/drivers/net/ppp_mppe.c
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
--- a/net/sunrpc/auth_gss/gss_spkm3_seal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_seal.c
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c