Linus Torvalds 29be6345bb Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs ...

Pull NFS client bugfixes from Trond Myklebust:
 - Stable fix for a NFSv4.1 delegation and state recovery deadlock
 - Stable fix for a loop on irrecoverable errors when returning
   delegations
 - Fix a 3-way deadlock between layoutreturn, open, and state recovery
 - Update the MAINTAINERS file with contact information for Trond
   Myklebust
 - Close needs to handle NFS4ERR_ADMIN_REVOKED
 - Enabling v4.2 should not recompile nfsd and lockd
 - Fix a couple of compile warnings

* tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: fix do_div() warning by instead using sector_div()
  MAINTAINERS: Update contact information for Trond Myklebust
  NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery
  SUNRPC: do not fail gss proc NULL calls with EACCES
  NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED
  NFSv4: Update list of irrecoverable errors on DELEGRETURN
  NFSv4 wait on recovery for async session errors
  NFS: Fix a warning in nfs_setsecurity
  NFS: Enabling v4.2 should not recompile nfsd and lockd

2013-12-05 13:05:48 -08:00

..

9p

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2013-11-15 13:28:47 +09:00

802

mrp: add periodictimer to allow retries when packets get lost

2013-09-23 16:53:52 -04:00

8021q

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-11-14 16:30:30 +09:00

appletalk

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

atm

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

ax25

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

batman-adv

batman-adv: generalize batman-adv icmp packet handling

2013-10-23 17:03:47 +02:00

bluetooth

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

2013-11-21 10:26:17 -05:00

bridge

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

2013-11-21 12:44:15 -05:00

caif

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

can

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2013-11-15 16:47:22 -08:00

ceph

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

core

{pktgen, xfrm} Update IPv4 header total len and checksum after tranformation

2013-12-01 20:33:52 -05:00

dcb

rtnetlink: Remove passing of attributes into rtnl_doit functions

2013-03-22 10:31:16 -04:00

dccp

ipv4: introduce new IP_MTU_DISCOVER mode IP_PMTUDISC_INTERFACE

2013-11-05 21:52:27 -05:00

decnet

netfilter: pass hook ops to hookfn

2013-10-14 11:29:31 +02:00

dns_resolver

net: strict_strtoul is obsolete, use kstrtoul instead

2013-07-12 16:09:14 -07:00

dsa

net: dsa: inherit addr_assign_type along with dev_addr

2013-09-03 20:57:49 -04:00

ethernet

ethernet: use likely() for common Ethernet encap

2013-09-30 21:52:53 -07:00

hsr

net/hsr: Support iproute print_opt ('ip -details ...')

2013-11-30 12:48:14 -05:00

ieee802154

genetlink: make multicast groups const, prevent abuse

2013-11-19 16:39:06 -05:00

ipv4

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-12-02 10:09:07 -08:00

ipv6

ipv6: fix possible seqlock deadlock in ip6_finish_output2

2013-11-30 12:48:13 -05:00

ipx

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

irda

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

iucv

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

key

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

l2tp

inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions

2013-11-23 14:46:23 -08:00

lapb

net/lapb: re-send packets on timeout

2013-09-23 16:52:45 -04:00

llc

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

mac80211

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-11-08 09:03:10 -05:00

mac802154

6lowpan: set and use mac_len for mac header length

2013-10-30 17:18:46 -04:00

mpls

ipip: add GSO/TSO support

2013-10-19 19:36:19 -04:00

netfilter

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

2013-11-21 12:44:15 -05:00

netlabel

genetlink: only pass array to genl_register_family_with_ops()

2013-11-19 16:39:05 -05:00

netlink

genetlink/pmcraid: use proper genetlink multicast API

2013-11-28 18:26:30 -05:00

netrom

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

nfc

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

openvswitch

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-11-19 15:50:47 -08:00

packet

af_packet: block BH in prb_shutdown_retire_blk_timer()

2013-11-29 16:11:08 -05:00

phonet

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-11-19 15:50:47 -08:00

rds

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

rfkill

net: rfkill: gpio: add ACPI support

2013-10-28 15:05:25 +01:00

rose

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

rxrpc

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

sched

netem: fix gemodel loss generator

2013-11-30 12:49:29 -05:00

sctp

sctp: Restore 'resent' bit to avoid retransmitted chunks for RTT measurements

2013-11-28 18:29:58 -05:00

sunrpc

Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2013-12-05 13:05:48 -08:00

tipc

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

unix

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

vmw_vsock

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

wimax

wimax: remove dead code

2013-11-21 13:09:42 -05:00

wireless

genetlink: make multicast groups const, prevent abuse

2013-11-19 16:39:06 -05:00

x25

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

xfrm

net: move pskb_put() to core code

2013-11-07 19:28:58 -05:00

compat.c

net: clamp ->msg_namelen instead of returning an error

2013-11-29 16:12:52 -05:00

Kconfig

kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly

2013-11-21 16:42:27 -08:00

Makefile

net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)

2013-11-03 23:20:14 -05:00

nonet.c

…

socket.c

net: clamp ->msg_namelen instead of returning an error

2013-11-29 16:12:52 -05:00

sysctl_net.c

net: Update the sysctl permissions handler to test effective uid/gid

2013-10-07 15:57:56 -04:00