Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Linus Torvalds [Sun, 28 Dec 2008 20:49:40 +0000 (12:49 -0800)]
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

19 files changed:
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/infiniband/hw/nes/nes_cm.c
drivers/infiniband/hw/nes/nes_hw.c
drivers/infiniband/hw/nes/nes_utils.c
drivers/infiniband/ulp/iser/iser_verbs.c
drivers/net/mlx4/en_cq.c
drivers/net/tun.c
drivers/s390/net/lcs.c
drivers/s390/net/qeth_l2_main.c
fs/cifs/connect.c
net/core/dev.c
net/ipv4/netfilter/ipt_LOG.c
net/ipv6/ip6_flowlabel.c
net/ipv6/netfilter/ip6t_LOG.c
net/netfilter/nfnetlink_log.c
net/socket.c
net/unix/af_unix.c
security/selinux/hooks.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2269,12 -2228,8 +2269,12 @@@ cifs_mount(struct super_block *sb, stru
  
                /* new SMB session uses our srvTcp ref */
                pSesInfo->server = srvTcp;
 -              sprintf(pSesInfo->serverName, "%pI4",
 -                      &sin_server->sin_addr.s_addr);
 +              if (srvTcp->addr.sockAddr6.sin6_family == AF_INET6)
-                       sprintf(pSesInfo->serverName, NIP6_FMT,
-                               NIP6(srvTcp->addr.sockAddr6.sin6_addr));
++                      sprintf(pSesInfo->serverName, "%pI6",
++                              &srvTcp->addr.sockAddr6.sin6_addr);
 +              else
-                       sprintf(pSesInfo->serverName, NIPQUAD_FMT,
-                               NIPQUAD(srvTcp->addr.sockAddr.sin_addr.s_addr));
++                      sprintf(pSesInfo->serverName, "%pI4",
++                              &srvTcp->addr.sockAddr.sin_addr.s_addr);
  
                write_lock(&cifs_tcp_ses_lock);
                list_add(&pSesInfo->smb_ses_list, &srvTcp->smb_ses_list);
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge
@@@ -1182,12 -1192,11 +1190,12 @@@ static int unix_socketpair(struct socke
        /* Join our sockets back to back */
        sock_hold(ska);
        sock_hold(skb);
-       unix_peer(ska)=skb;
-       unix_peer(skb)=ska;
+       unix_peer(ska) = skb;
+       unix_peer(skb) = ska;
        ska->sk_peercred.pid = skb->sk_peercred.pid = task_tgid_vnr(current);
 -      ska->sk_peercred.uid = skb->sk_peercred.uid = current->euid;
 -      ska->sk_peercred.gid = skb->sk_peercred.gid = current->egid;
 +      current_euid_egid(&skb->sk_peercred.uid, &skb->sk_peercred.gid);
 +      ska->sk_peercred.uid = skb->sk_peercred.uid;
 +      ska->sk_peercred.gid = skb->sk_peercred.gid;
  
        if (ska->sk_type != SOCK_DGRAM) {
                ska->sk_state = TCP_ESTABLISHED;
Simple merge