• L
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 3985c7ce
    Linus Torvalds 提交于
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      isdn: mISDN: socket: fix information leak to userland
      netdev: can: Change mail address of Hans J. Koch
      pcnet_cs: add new_id
      net: Truncate recvfrom and sendto length to INT_MAX.
      RDS: Let rds_message_alloc_sgs() return NULL
      RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace
      RDS: Clean up error handling in rds_cmsg_rdma_args
      RDS: Return -EINVAL if rds_rdma_pages returns an error
      net: fix rds_iovec page count overflow
      can: pch_can: fix section mismatch warning by using a whitelisted name
      can: pch_can: fix sparse warning
      netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probe
      ip_gre: fix fallback tunnel setup
      vmxnet: trivial annotation of protocol constant
      vmxnet3: remove unnecessary byteswapping in BAR writing macros
      ipv6/udp: report SndbufErrors and RcvbufErrors
      phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr
    3985c7ce
socket.c 74.6 KB