summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-12-1719-89/+105
|\
| * Merge tag 'mac80211-for-davem-2016-12-16' of git://git.kernel.org/pub/scm/lin...David S. Miller2016-12-173-8/+11
| |\
| | * mac80211: fix legacy and invalid rx-rate reportBen Greear2016-12-151-6/+8
| | * mac80211: Ensure enough headroom when forwarding mesh pktCedric Izoard2016-12-131-1/+1
| | * mac80211: don't call drv_set_default_unicast_key() for VLANsJohannes Berg2016-12-131-1/+2
| * | net: ipv6: check route protocol when deleting routesMantas M2016-12-171-0/+2
| * | net/x25: use designated initializersKees Cook2016-12-171-1/+1
| * | net: use designated initializersKees Cook2016-12-171-1/+1
| * | ATM: use designated initializersKees Cook2016-12-174-55/+54
| * | net: xdp: add invalid buffer warningJohn Fastabend2016-12-171-0/+6
| * | sctp: sctp_transport_lookup_process should rcu_read_unlock when transport is ...Xin Long2016-12-171-4/+3
| * | sctp: sctp_epaddr_lookup_transport should be protected by rcu_read_lockXin Long2016-12-171-1/+4
| * | irda: irnet: add member name to the miscdevice declarationLABBE Corentin2016-12-171-3/+3
| * | irda: irnet: Remove unused IRNET_MAJOR defineLABBE Corentin2016-12-171-3/+0
| * | irnet: ppp: move IRNET_MINOR to include/linux/miscdevice.hLABBE Corentin2016-12-171-1/+0
| * | irda: irnet: Move linux/miscdevice.h includeLABBE Corentin2016-12-172-1/+1
| * | irda: irproc.c: Remove unneeded linux/miscdevice.h includeLABBE Corentin2016-12-171-1/+0
| * | inet: Fix get port to handle zero port number with soreuseport setTom Herbert2016-12-172-8/+13
| * | inet: Don't go into port scan when looking for specific bind portTom Herbert2016-12-171-1/+1
| * | net/sched: cls_flower: Use masked key when calling HW offloadsPaul Blakey2016-12-171-1/+1
| * | net/sched: cls_flower: Use mask for addr_typePaul Blakey2016-12-171-0/+4
| |/
* | Merge tag 'ceph-for-4.10-rc1' of git://github.com/ceph/ceph-clientLinus Torvalds2016-12-169-507/+256
|\ \
| * | libceph: remove now unused finish_request() wrapperIlya Dryomov2016-12-141-10/+4
| * | libceph: always signal completion when doneIlya Dryomov2016-12-141-14/+11
| * | crush: include mapper.h in mapper.cTobias Klauser2016-12-121-0/+2
| * | libceph: no need to drop con->mutex for ->get_authorizer()Ilya Dryomov2016-12-121-6/+0
| * | libceph: drop len argument of *verify_authorizer_reply()Ilya Dryomov2016-12-124-6/+6
| * | libceph: verify authorize reply on connectIlya Dryomov2016-12-121-0/+13
| * | libceph: no need for GFP_NOFS in ceph_monc_init()Ilya Dryomov2016-12-121-6/+6
| * | libceph: stop allocating a new cipher on every crypto requestIlya Dryomov2016-12-122-25/+61
| * | libceph: uninline ceph_crypto_key_destroy()Ilya Dryomov2016-12-122-8/+9
| * | libceph: remove now unused ceph_*{en,de}crypt*() functionsIlya Dryomov2016-12-122-383/+0
| * | libceph: switch ceph_x_decrypt() to ceph_crypt()Ilya Dryomov2016-12-121-46/+32
| * | libceph: switch ceph_x_encrypt() to ceph_crypt()Ilya Dryomov2016-12-121-34/+37
| * | libceph: tweak calcu_signature() a littleIlya Dryomov2016-12-121-15/+28
| * | libceph: rename and align ceph_x_authorizer::reply_bufIlya Dryomov2016-12-122-6/+7
| * | libceph: introduce ceph_crypt() for in-place en/decryptionIlya Dryomov2016-12-122-0/+89
| * | libceph: introduce ceph_x_encrypt_offset()Ilya Dryomov2016-12-121-2/+6
| * | libceph: old_key in process_one_ticket() is redundantIlya Dryomov2016-12-121-3/+1
| * | libceph: ceph_x_encrypt_buflen() takes in_lenIlya Dryomov2016-12-121-3/+4
* | | Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2016-12-161-3/+3
|\ \ \
| * | | Revert "af_unix: fix hard linked sockets on overlay"Miklos Szeredi2016-12-161-3/+3
* | | | Merge tag 'nfsd-4.10' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2016-12-169-169/+101
|\ \ \ \
| * | | | sunrpc: use DEFINE_SPINLOCK()Fabian Frederick2016-12-061-2/+1
| * | | | svcrdma: Further clean-up of svc_rdma_get_inv_rkey()Chuck Lever2016-11-301-14/+5
| * | | | svcrdma: Break up dprintk format in svc_rdma_accept()Chuck Lever2016-11-301-37/+18
| * | | | svcrdma: Remove unused variable in rdma_copy_tail()Chuck Lever2016-11-301-2/+0
| * | | | svcrdma: Remove unused variables in xprt_rdma_bc_allocate()Chuck Lever2016-11-301-4/+0
| * | | | svcrdma: Remove svc_rdma_op_ctxt::wc_statusChuck Lever2016-11-302-3/+2
| * | | | svcrdma: Remove DMA map accountingChuck Lever2016-11-302-11/+3