summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2015-07-271-0/+4
|\
| * Bluetooth: Fix NULL pointer dereference in smp_conn_securityJohan Hedberg2015-07-231-0/+4
* | net: fec: introduce fec_ptp_stop and use in probe fail pathLucas Stach2015-07-273-3/+13
* | net: fec: use managed DMA API functions to allocate BD ringLucas Stach2015-07-271-2/+2
* | niu: don't count tx error twice in case of headroom realloc failsJiri Pirko2015-07-271-3/+1
* | Merge branch 'inet-frag-fixes'David S. Miller2015-07-276-47/+42
|\ \
| * | inet: frags: remove INET_FRAG_EVICTED and use list_evictor for the testNikolay Aleksandrov2015-07-274-5/+7
| * | inet: frag: don't wait for timer deletion when evictingFlorian Westphal2015-07-271-18/+11
| * | inet: frag: change *_frag_mem_limit functions to take netns_frags as argumentFlorian Westphal2015-07-276-20/+20
| * | inet: frag: don't re-use chainlist for evictorFlorian Westphal2015-07-272-5/+5
|/ /
* | net: sctp: stop spamming klog with rfc6458, 5.3.2. deprecation warningsDaniel Borkmann2015-07-271-6/+0
* | Merge branch 'mlx4-fixes'David S. Miller2015-07-274-5/+22
|\ \
| * | net/mlx4_en: Remove BUG_ON assert when checking if ring is fullIdo Shamay2015-07-271-1/+0
| * | net/mlx4_core: Relieve cpu load average on the port sending flowJack Morgenstein2015-07-271-2/+15
| * | net/mlx4_core: Fix wrong index in propagating port change event to VFsJack Morgenstein2015-07-271-2/+2
| * | net/mlx4_core: Use sink counter for the VF default as fallbackOr Gerlitz2015-07-271-0/+5
|/ /
* | bridge: netlink: fix slave_changelink/br_setport race conditionsNikolay Aleksandrov2015-07-271-1/+9
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-07-2513-79/+164
|\ \
| * | netfilter: nf_conntrack: Support expectations in different zonesJoe Stringer2015-07-221-1/+2
| * | Merge tag 'ipvs-fixes-for-v4.2' of https://git.kernel.org/pub/scm/linux/kerne...Pablo Neira Ayuso2015-07-205-39/+110
| |\ \
| | * | ipvs: call skb_sender_cpu_clearJulian Anastasov2015-07-141-0/+6
| | * | ipvs: fix crash with sync protocol v0 and FTPJulian Anastasov2015-07-141-1/+1
| | * | ipvs: skb_orphan in case of forwardingAlex Gartrell2015-07-141-0/+27
| | * | ipvs: fix crash if scheduler is changedJulian Anastasov2015-07-143-37/+69
| | * | ipvs: do not use random local source address for tunnelsJulian Anastasov2015-07-141-1/+0
| | * | ipvs: fix ipv6 route unreach panicAlex Gartrell2015-07-141-0/+7
| * | | netfilter: fix netns dependencies with conntrack templatesPablo Neira Ayuso2015-07-205-34/+51
| |/ /
| * | netfilter: IDLETIMER: fix lockdep warningDmitry Torokhov2015-07-131-0/+1
| * | netfilter: ctnetlink: put back references to master ct and expect objectsPablo Neira Ayuso2015-07-101-5/+0
* | | cgroup: net_cls: fix false-positive "suspicious RCU usage"Konstantin Khlebnikov2015-07-251-1/+2
* | | sch_choke: drop all packets in queue during resetWANG Cong2015-07-251-0/+13
* | | sch_plug: purge buffered packets during resetWANG Cong2015-07-251-0/+1
* | | Merge branch 'fib_select_default-fixes'David S. Miller2015-07-255-15/+35
|\ \ \ | |_|/ |/| |
| * | ipv4: consider TOS in fib_select_defaultJulian Anastasov2015-07-255-15/+30
| * | ipv4: fib_select_default should match the prefixJulian Anastasov2015-07-251-0/+5
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-07-2279-811/+714
|\ \
| * | ravb: fix ring memory allocationSergei Shtylyov2015-07-221-25/+34
| * | net: phy: dp83867: Fix warning check for setting the internal delayDan Murphy2015-07-221-1/+1
| * | openvswitch: allocate nr_node_ids flow_stats instead of num_possible_nodesChris J Arges2015-07-221-1/+1
| * | netlink: don't hold mutex in rcu callback when releasing mmapd ringFlorian Westphal2015-07-221-32/+47
| * | Merge branch 'arm-bpf-fixes'David S. Miller2015-07-221-13/+44
| |\ \
| | * | ARM: net: fix vlan access instructions in ARM JIT.Nicolas Schichan2015-07-221-3/+5
| | * | ARM: net: handle negative offsets in BPF JIT.Nicolas Schichan2015-07-221-9/+38
| | * | ARM: net: fix condition for load_order > 0 when translating load instructions.Nicolas Schichan2015-07-221-1/+1
| |/ /
| * | tcp: suppress a division by zero warningEric Dumazet2015-07-221-6/+5
| * | Merge tag 'wireless-drivers-for-davem-2015-07-20' of git://git.kernel.org/pub...David S. Miller2015-07-2212-410/+144
| |\ \
| | * \ Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/li...Kalle Valo2015-07-1711-410/+143
| | |\ \
| | | * | iwlwifi: nvm: remove mac address byte swapping in 8000 familyLiad Kaufman2015-07-121-7/+5
| | | * | Revert "iwlwifi: pcie: New RBD allocation model"Emmanuel Grumbach2015-07-123-374/+97
| | | * | iwlwifi: mvm: Add preemptive flag to scheulded scanAvraham Stern2015-07-122-1/+5