summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2016-05-246-62/+81
|\
| * sunrpc: fix stripping of padded MIC tokensTomáš Trnka2016-05-231-2/+2
| * svcrpc: autoload rdma moduleJ. Bruce Fields2016-05-231-4/+19
| * svcrdma: Generalize svc_rdma_xdr_decode_req()Chuck Lever2016-05-132-11/+23
| * svcrdma: Eliminate code duplication in svc_rdma_recvfrom()Chuck Lever2016-05-131-21/+5
| * svcrdma: Drain QP before freeing svcrdma_xprtChuck Lever2016-05-131-0/+3
| * svcrdma: Post Receives only for forward channel requestsChuck Lever2016-05-131-1/+1
| * svcrdma: Remove superfluous line from rdma_read_chunks()Chuck Lever2016-05-131-3/+1
| * svcrdma: svc_rdma_put_context() is invoked twice in Send error pathChuck Lever2016-05-131-15/+13
| * svcrdma: Do not add XDR padding to xdr_buf page vectorChuck Lever2016-05-131-1/+1
| * svcrdma: Support IPv6 with NFS/RDMAShirley Ma2016-05-131-1/+11
| * Remove unnecessary allocationJ. Bruce Fields2016-05-031-3/+2
* | Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2016-05-203-27/+24
|\ \
| * \ Merge 4.6-rc7 into tty-nextGreg Kroah-Hartman2016-05-0934-238/+376
| |\ \
| * | | tty: Replace ASYNC_INITIALIZED bit and update atomicallyPeter Hurley2016-04-302-8/+9
| * | | tty: Replace ASYNC_CHECK_CD and update atomicallyPeter Hurley2016-04-303-7/+4
| * | | tty: Replace ASYNC_NORMAL_ACTIVE bit and update atomicallyPeter Hurley2016-04-301-5/+5
| * | | tty: Replace ASYNC_CTS_FLOW bit and update atomicallyPeter Hurley2016-04-301-2/+1
| * | | tty: Replace TTY_THROTTLED bit tests with tty_throttled()Peter Hurley2016-04-301-1/+1
| * | | tty: Replace TTY_IO_ERROR bit tests with tty_io_error()Peter Hurley2016-04-302-4/+4
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-05-2033-303/+714
|\ \ \
| * | | udp: prevent skbs lingering in tunnel socket queuesHannes Frederic Sowa2016-05-202-2/+2
| * | | ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled with FOU/GUEAlexander Duyck2016-05-201-4/+8
| * | | RDS: TCP: Avoid rds connection churn from rogue SYNsSowmini Varadhan2016-05-201-4/+6
| * | | RDS: TCP: rds_tcp_accept_worker() must exit gracefully when terminating rds-tcpSowmini Varadhan2016-05-201-0/+3
| * | | ipv6: Don't reset inner headers in ip6_tnl_xmitTom Herbert2016-05-201-5/+0
| * | | ip4ip6: Support for GSO/GROTom Herbert2016-05-203-6/+44
| * | | ip6ip6: Support for GSO/GROTom Herbert2016-05-202-3/+26
| * | | ipv6: Set features for IPv6 tunnelsTom Herbert2016-05-201-0/+9
| * | | ip6_tunnel: Add support for fou/gue encapsulationTom Herbert2016-05-201-0/+72
| * | | ip6_gre: Add support for fou/gue encapsulationTom Herbert2016-05-201-4/+75
| * | | fou: Add encap ops for IPv6 tunnelsTom Herbert2016-05-202-0/+141
| * | | ip6_tun: Add infrastructure for doing encapsulationTom Herbert2016-05-202-13/+86
| * | | fou: Support IPv6 in fouTom Herbert2016-05-201-12/+35
| * | | fou: Split out {fou,gue}_build_headerTom Herbert2016-05-201-10/+37
| * | | fou: Call setup_udp_tunnel_sockTom Herbert2016-05-201-34/+16
| * | | net: Cleanup encap items in ip_tunnels.hTom Herbert2016-05-202-45/+4
| * | | ipv6: Change "final" protocol processing for encapsulationTom Herbert2016-05-201-1/+14
| * | | ipv6: Fix nexthdr for reinjectionTom Herbert2016-05-201-3/+15
| * | | net: define gso types for IPx over IPv4 and IPv6Tom Herbert2016-05-206-18/+15
| * | | gso: Remove arbitrary checks for unsupported GSOTom Herbert2016-05-207-102/+1
| * | | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2016-05-196-25/+93
| |\ \ \
| | * | | batman-adv: initialize ELP orig address on secondary interfacesMarek Lindner2016-05-183-9/+34
| | * | | batman-adv: Avoid duplicate neigh_node additionsLinus Lüssing2016-05-181-2/+4
| | * | | batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tqSven Eckelmann2016-05-181-2/+3
| | * | | batman-adv: make sure ELP/OGM orig MAC is updated on address changeAntonio Quartulli2016-05-181-4/+22
| | * | | batman-adv: Fix unexpected free of bcast_own on add_if errorSven Eckelmann2016-05-181-3/+1
| | * | | batman-adv: Fix refcnt leak in batadv_v_neigh_*Sven Eckelmann2016-05-181-7/+25
| | * | | batman-adv: Avoid nullptr derefence in batadv_v_neigh_is_sobSven Eckelmann2016-05-181-0/+4
| | * | | batman-adv: fix skb deref after freeFlorian Westphal2016-05-181-1/+3