summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into locking/core, to resolve conflictsIngo Molnar2017-08-118-21/+28
|\
| * packet: fix tp_reserve race in packet_set_ringWillem de Bruijn2017-08-101-4/+9
| * udp: consistently apply ufo or fragmentationWillem de Bruijn2017-08-103-7/+10
| * net: sched: set xt_tgchk_param par.nft_compat as 0 in ipt_init_targetXin Long2017-08-091-1/+1
| * igmp: Fix regression caused by igmp sysctl namespace code.Nikolay Borisov2017-08-092-6/+7
| * tipc: remove premature ESTABLISH FSM event at link synchronizationJon Paul Maloy2017-08-091-3/+1
* | jump_label: Do not use unserialized static_key_enabled()Paolo Bonzini2017-08-102-4/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-08-0913-67/+114
|\
| * net: avoid skb_warn_bad_offload false positives on UFOWillem de Bruijn2017-08-083-3/+3
| * rds: Reintroduce statistics countingHåkon Bugge2017-08-081-1/+4
| * tcp: fastopen: tcp_connect() must refresh the routeEric Dumazet2017-08-081-0/+4
| * net: sched: set xt_tgchk_param par.net properly in ipt_init_targetXin Long2017-08-081-10/+10
| * tcp: fix xmit timer to only be reset if data ACKed/SACKedNeal Cardwell2017-08-032-18/+16
| * tcp: enable xmit timer fix by having TLP use time when RTO should fireNeal Cardwell2017-08-031-9/+5
| * tcp: introduce tcp_rto_delta_us() helper for xmit timer fixNeal Cardwell2017-08-031-4/+1
| * ipv6: set rt6i_protocol properly in the route when it is installedXin Long2017-08-031-8/+3
| * net: fix keepalive code vs TCP_FASTOPEN_CONNECTEric Dumazet2017-08-031-1/+2
| * Merge tag 'batadv-net-for-davem-20170802' of git://git.open-mesh.org/linux-mergeDavid S. Miller2017-08-032-9/+53
| |\
| | * batman-adv: fix TT sync flag inconsistenciesLinus Lüssing2017-07-312-9/+53
| * | tcp: avoid setting cwnd to invalid ssthresh after cwnd reduction statesYuchung Cheng2017-08-021-2/+2
| * | gue: fix remcsum when GRO on and CHECKSUM_PARTIAL boundary is outer UDPK. Den2017-08-011-0/+1
| * | Cipso: cipso_v4_optptr enter infinite loopyujuan.qi2017-08-011-2/+10
* | | Merge tag 'ceph-for-4.13-rc4' of git://github.com/ceph/ceph-clientLinus Torvalds2017-08-044-37/+45
|\ \ \ | |/ / |/| |
| * | libceph: make RECOVERY_DELETES feature create a new intervalIlya Dryomov2017-08-012-1/+9
| * | libceph: upmap semantic changesIlya Dryomov2017-08-011-28/+11
| * | crush: assume weight_set != null imples weight_set_size > 0Ilya Dryomov2017-08-012-1/+5
| * | libceph: fallback for when there isn't a pool-specific choose_argIlya Dryomov2017-08-011-1/+11
| * | libceph: don't call ->reencode_message() more than once per messageIlya Dryomov2017-08-011-3/+3
| * | libceph: make encode_request_*() work with r_mempool requestsIlya Dryomov2017-08-011-3/+6
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-07-3115-52/+79
|\ \ \ | |/ / |/| |
| * | udp6: fix jumbogram receptionPaolo Abeni2017-07-312-1/+11
| * | ipv4: fib: Fix NULL pointer deref during fib_sync_down_dev()Ido Schimmel2017-07-311-1/+1
| * | tcp: avoid bogus gcc-7 array-bounds warningArnd Bergmann2017-07-291-2/+3
| * | udp6: fix socket leak on early demuxPaolo Abeni2017-07-292-10/+20
| * | net: check dev->addr_len for dev_set_mac_address()WANG Cong2017-07-291-0/+2
| * | dccp: fix a memleak for dccp_feat_init err processXin Long2017-07-271-2/+5
| * | dccp: fix a memleak that dccp_ipv4 doesn't put reqsk properlyXin Long2017-07-271-0/+1
| * | dccp: fix a memleak that dccp_ipv6 doesn't put reqsk properlyXin Long2017-07-271-0/+1
| * | netpoll: Fix device name check in netpoll_setup()Matthias Kaehlcke2017-07-261-1/+1
| * | udp: unbreak build lacking CONFIG_XFRMPaolo Abeni2017-07-261-1/+1
| * | ipv6: Don't increase IPSTATS_MIB_FRAGFAILS twice in ip6_fragment()Stefano Brivio2017-07-251-4/+0
| * | udp: preserve head state for IP_CMSG_PASSSECPaolo Abeni2017-07-251-20/+18
| * | net: dsa: Initialize ds->cpu_port_mask earlierFlorian Fainelli2017-07-241-6/+7
| * | packet: fix use-after-free in prb_retire_rx_blk_timer_expired()WANG Cong2017-07-241-1/+1
| * | openvswitch: fix potential out of bound access in parse_ctLiping Zhang2017-07-241-2/+5
| * | net/socket: fix type in assignment and trim long linePaolo Abeni2017-07-241-2/+3
* | | Merge tag 'nfs-for-4.13-2' of git://git.linux-nfs.org/projects/anna/linux-nfsLinus Torvalds2017-07-211-0/+2
|\ \ \ | |/ / |/| |
| * | net/sunrpc/xprt_sock: fix regression in connection error reporting.NeilBrown2017-07-211-0/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-07-2025-216/+141
|\ \ \
| * | | rds: Make sure updates to cp_send_gen can be observedHåkon Bugge2017-07-201-3/+3