summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-05-0933-930/+916
|\
| * netfilter: conntrack: use single slab cacheFlorian Westphal2016-05-092-24/+14
| * netfilter: conntrack: use a single nat bysource table for all namespacesFlorian Westphal2016-05-092-20/+17
| * netfilter: conntrack: make netns address part of nat bysrc hashFlorian Westphal2016-05-091-3/+3
| * Merge tag 'ipvs2-for-v4.7' of https://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2016-05-062-4/+26
| |\
| | * ipvs: make drop_entry protection effective for SIP-peMarco Angaroni2016-05-062-4/+26
| * | netfilter: conntrack: use a single expectation table for all namespacesFlorian Westphal2016-05-066-33/+25
| * | netfilter: conntrack: make netns address part of expect hashFlorian Westphal2016-05-061-7/+10
| * | netfilter: conntrack: check netns when walking expect hashFlorian Westphal2016-05-063-4/+30
| |/
| * netfilter: nf_tables: allow set names up to 32 bytesPablo Neira Ayuso2016-05-053-4/+5
| * netfilter: x_tables: get rid of old and inconsistent debuggingPablo Neira Ayuso2016-05-053-573/+117
| * openvswitch: __nf_ct_l{3,4}proto_find() always return a valid pointerPablo Neira Ayuso2016-05-051-8/+0
| * netfilter: conntrack: introduce clash resolution on insertion racePablo Neira Ayuso2016-05-054-3/+57
| * netfilter: conntrack: introduce nf_ct_acct_update()Pablo Neira Ayuso2016-05-051-23/+19
| * netfilter: conntrack: __nf_ct_l4proto_find() always returns valid pointerPablo Neira Ayuso2016-05-051-1/+1
| * netfilter: conntrack: consider ct netns in early_drop logicFlorian Westphal2016-05-051-18/+25
| * netfilter: conntrack: use a single hashtable for all namespacesFlorian Westphal2016-05-0510-68/+62
| * netfilter: conntrack: make netns address part of hashFlorian Westphal2016-05-051-17/+18
| * netfilter: conntrack: check netns when comparing conntrack objectsFlorian Westphal2016-05-053-12/+22
| * netfilter: conntrack: small refactoring of conntrack seq_printfFlorian Westphal2016-05-051-5/+19
| * netfilter: conntrack: use nf_ct_key_equal() in more placesFlorian Westphal2016-05-051-18/+11
| * netfilter: conntrack: don't attempt to iterate over empty tableFlorian Westphal2016-05-051-0/+3
| * netfilter: conntrack: fix lookup race during hash resizeFlorian Westphal2016-05-051-5/+19
| * netfilter: conntrack: keep BH enabled during lookupFlorian Westphal2016-05-051-17/+8
| * netfilter: nftables: add connlabel set supportFlorian Westphal2016-05-051-0/+30
| * netfilter: fix IS_ERR_VALUE usagePablo Neira Ayuso2016-04-294-9/+15
| * Merge tag 'ipvs-for-v4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/...Pablo Neira Ayuso2016-04-256-5/+260
| |\
| | * ipvs: don't alter conntrack in OPS modeMarco Angaroni2016-04-202-1/+6
| | * ipvs: optimize release of connections in OPS modeMarco Angaroni2016-04-201-3/+23
| | * ipvs: handle connections started by real-serversMarco Angaroni2016-04-204-1/+231
| * | netfilter: ip6t_SYNPROXY: unnecessary to check whether ip6_route_output retur...Liping Zhang2016-04-251-1/+1
| * | netfilter: nf_ct_helper: disable automatic helper assignmentPablo Neira Ayuso2016-04-251-2/+2
| * | netfilter: nft_rbtree: allow adjacent intervals with dynamic updatesPablo Neira Ayuso2016-04-251-5/+35
| * | netfilter: nft_rbtree: introduce nft_rbtree_interval_end() helperPablo Neira Ayuso2016-04-251-3/+6
| * | netfilter: nf_tables: parse element flags from nft_del_setelem()Pablo Neira Ayuso2016-04-251-5/+33
| * | netfilter: nf_tables: introduce nft_setelem_parse_flags() helperPablo Neira Ayuso2016-04-251-12/+22
| * | netfilter: conntrack: use get_random_once for conntrack hash seedFlorian Westphal2016-04-252-25/+3
| * | netfilter: conntrack: use get_random_once for nat and expectationsFlorian Westphal2016-04-252-6/+7
| * | netfilter: conntrack: move generation seqcnt out of netns_ctFlorian Westphal2016-04-252-10/+11
* | | Merge branch 'dsa-mv88e6xxx-monolithic'David S. Miller2016-05-0913-1264/+899
|\ \ \
| * | | net: dsa: mv88e6xxx: factorize the switch driverVivien Didelot2016-05-0913-630/+302
| * | | net: dsa: mv88e6131: use EDSA tag protocolVivien Didelot2016-05-092-2/+2
| * | | net: dsa: mv88e6xxx: factorize switch setupVivien Didelot2016-05-096-98/+38
| * | | net: dsa: mv88e6131: drop frames priorities setupVivien Didelot2016-05-091-18/+0
| * | | net: dsa: mv88e6xxx: factorize GLOBAL_CONTROL_2 setupVivien Didelot2016-05-095-60/+7
| * | | net: dsa: mv88e6xxx: factorize GLOBAL_MONITOR_CONTROL setupVivien Didelot2016-05-095-56/+12
| * | | net: dsa: mv88e6131: drop VLAN Ethertype setupVivien Didelot2016-05-091-5/+0
| * | | net: dsa: mv88e6xxx: factorize GLOBAL_CONTROL setupVivien Didelot2016-05-095-37/+13
| * | | net: dsa: mv88e6xxx: factorize global setupVivien Didelot2016-05-096-70/+56
| * | | net: dsa: mv88e6xxx: factorize switch resetVivien Didelot2016-05-096-83/+76
OpenPOWER on IntegriCloud