summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-04-0123-146/+224
|\
| * tun, bpf: fix suspicious RCU usage in tun_{attach, detach}_filterDaniel Borkmann2016-04-011-12/+21
| * rtnl: fix msg size calculation in if_nlmsg_size()Nicolas Dichtel2016-03-311-0/+1
| * bpf: make padding in bpf_tunnel_key explicitDaniel Borkmann2016-03-301-1/+4
| * ipv6: udp: fix UDP_MIB_IGNOREDMULTI updatesEric Dumazet2016-03-301-2/+2
| * gro: Allow tunnel stacking in the case of FOU/GUEAlexander Duyck2016-03-301-0/+16
| * sctp: really allow using GFP_KERNEL on sctp_packet_transmitMarcelo Ricardo Leitner2016-03-301-3/+3
| * bridge: Allow set bridge ageing time when switchdev disabledHaishuang Yan2016-03-301-1/+1
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2016-03-2813-122/+166
| |\
| | * netfilter: ipv4: fix NULL dereferenceLiping Zhang2016-03-282-36/+38
| | * netfilter: x_tables: enforce nul-terminated table name from getsockopt GET_EN...Pablo Neira Ayuso2016-03-284-0/+10
| | * netfilter: nfnetlink_queue: honor NFQA_CFG_F_FAIL_OPEN when netlink unicast f...Pablo Neira Ayuso2016-03-281-1/+6
| | * netfilter: x_tables: fix unconditional helperFlorian Westphal2016-03-283-33/+31
| | * netfilter: x_tables: make sure e->next_offset covers remaining blob sizeFlorian Westphal2016-03-283-6/+12
| | * netfilter: x_tables: validate e->target_offset earlyFlorian Westphal2016-03-283-27/+24
| | * openvswitch: call only into reachable nf-nat codeArnd Bergmann2016-03-282-9/+11
| | * openvswitch: Fix checking for new expected connections.Jarno Rajahalme2016-03-281-2/+3
| | * netfilter: ipset: fix race condition in ipset save, swap and deleteVishwanath Pai2016-03-284-8/+31
| * | openvswitch: Use proper buffer size in nla_memcpyHaishuang Yan2016-03-281-1/+2
| |/
| * Fix returned tc and hoplimit values for route with IPv6 encapsulationQuentin Armitage2016-03-271-2/+2
| * netpoll: Fix extra refcount release in netpoll_cleanup()Bjorn Helgaas2016-03-251-1/+2
| * switchdev: fix typo in comments/docNicolas Dichtel2016-03-241-1/+1
| * xfrm: Fix crash observed during device unregistration and decryptionsubashab@codeaurora.org2016-03-241-0/+3
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2016-03-265-272/+344
|\ \ | |/ |/|
| * libceph: use KMEM_CACHE macroGeliang Tang2016-03-251-8/+2
| * libceph: use sizeof_footer() moreIlya Dryomov2016-03-251-16/+3
| * libceph: add helper that duplicates last extent operationYan, Zheng2016-03-251-0/+22
| * libceph: enable large, variable-sized OSD requestsIlya Dryomov2016-03-251-15/+28
| * libceph: osdc->req_mempool should be backed by a slab poolIlya Dryomov2016-03-251-2/+2
| * libceph: make r_request msg_size calculation clearerIlya Dryomov2016-03-251-10/+11
| * libceph: move r_reply_op_{len,result} into struct ceph_osd_req_opYan, Zheng2016-03-251-2/+2
| * libceph: rename ceph_osd_req_op::payload_len to indata_lenIlya Dryomov2016-03-251-6/+6
| * libceph: behave in mon_fault() if cur_mon < 0Ilya Dryomov2016-03-251-14/+9
| * libceph: reschedule tick in mon_fault()Ilya Dryomov2016-03-251-4/+4
| * libceph: introduce and switch to reopen_session()Ilya Dryomov2016-03-251-17/+16
| * libceph: monc hunt rate is 3s with backoff up to 30sIlya Dryomov2016-03-251-9/+16
| * libceph: monc ping rate is 10sIlya Dryomov2016-03-252-7/+2
| * libceph: pick a different monitor when reconnectingIlya Dryomov2016-03-251-28/+57
| * libceph: revamp subs code, switch to SUBSCRIBE2 protocolIlya Dryomov2016-03-253-83/+147
| * libceph: decouple hunting and subs managementIlya Dryomov2016-03-251-9/+22
| * libceph: move debugfs initialization into __ceph_open_session()Ilya Dryomov2016-03-252-51/+4
* | Merge tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2016-03-248-439/+359
|\ \
| * | sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects a raceNeilBrown2016-03-171-3/+3
| * | svcrdma: Use new CQ API for RPC-over-RDMA server send CQsChuck Lever2016-03-014-175/+114
| * | svcrdma: Use new CQ API for RPC-over-RDMA server receive CQsChuck Lever2016-03-011-90/+39
| * | svcrdma: Remove close_out exit pathChuck Lever2016-03-011-11/+1
| * | svcrdma: Hook up the logic to return ERR_CHUNKChuck Lever2016-03-012-13/+46
| * | svcrdma: Use correct XID in error repliesChuck Lever2016-03-012-7/+3
| * | svcrdma: Make RDMA_ERROR messages workChuck Lever2016-03-014-65/+72
| * | svcrdma: svc_rdma_post_recv() should close connection on errorChuck Lever2016-03-014-24/+19