summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* sch_cake: Permit use of connmarks as tin classifiersKevin Darbyshire-Bryant2019-03-042-7/+28
* sch_cake: Make the dual modes fairerGeorge Amanakis2019-03-041-29/+63
* Merge branch 'Macb-power-management-support-for-ZynqMP'David S. Miller2019-03-032-32/+188
|\
| * net: macb: Add support for suspend/resume with full power downHarini Katakam2019-03-031-2/+38
| * net: macb: Add pm runtime supportHarini Katakam2019-03-031-36/+112
| * net: macb: Support clock management for tsu_clkHarini Katakam2019-03-032-6/+27
| * net: macb: Check MDIO state before read/write and use timeoutsHarini Katakam2019-03-032-6/+29
|/
* Merge branch 'net-dsa-microchip-add-KSZ9893-switch-support'David S. Miller2019-03-038-15/+316
|\
| * net: dsa: microchip: add KSZ9893 switch supportTristram Ha2019-03-033-15/+235
| * net: dsa: add KSZ9893 switch tagging supportTristram Ha2019-03-034-0/+38
| * dt-bindings: net: dsa: document additional Microchip KSZ9477 family switchesTristram Ha2019-03-031-0/+43
|/
* Merge tag 'mlx5-updates-2019-03-01' of git://git.kernel.org/pub/scm/linux/ker...David S. Miller2019-03-0215-109/+606
|\
| * net/mlx5: Update the list of the PCI supported devicesEran Ben Elisha2019-03-011-0/+2
| * net/mlx5e: Set peer flow needed also for multipathRoi Dayan2019-03-011-2/+9
| * net/mlx5e: Update check for merged eswitch deviceRoi Dayan2019-03-011-4/+3
| * net/mlx5e: Use hint to resolve route when in HW multipath modeRoi Dayan2019-03-011-0/+12
| * net/mlx5e: Always query offloaded tc peer rule counterRoi Dayan2019-03-011-11/+15
| * net/mlx5e: Re-attempt to offload flows on multipath port affinity eventsRoi Dayan2019-03-014-12/+71
| * net/mlx5: Emit port affinity event for multipath offloadsRoi Dayan2019-03-012-0/+12
| * net/mlx5e: Allow one failure when offloading tc encap rules under multipathRoi Dayan2019-03-011-2/+12
| * net/mlx5e: Don't inherit flow flags on peer flow creationRoi Dayan2019-03-011-3/+4
| * net/mlx5e: Activate HW multipath and handle port affinity based on FIB eventsRoi Dayan2019-03-016-0/+326
| * net/mlx5: Add multipath modeRoi Dayan2019-03-014-2/+28
| * net/mlx5: Use own workqueue for lag netdev events processingRoi Dayan2019-03-012-1/+9
| * net/mlx5: Expose lag operations in header fileRoi Dayan2019-03-012-48/+68
| * net/mlx5: Use unsigned int bit instead of bool as a struct memberRoi Dayan2019-03-011-1/+1
| * net/mlx5e: Don't make internal use of errno to denote missing neighRoi Dayan2019-03-012-14/+22
| * net/mlx5e: Cleanup attach encap functionRoi Dayan2019-03-011-14/+17
| * net/mlx5e: Declare mlx5e_tx_reporter_recover_from_ctx as staticEran Ben Elisha2019-03-011-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2019-03-0257-2419/+1747
|\ \
| * | netfilter: nf_tables: merge ipv4 and ipv6 nat chain typesFlorian Westphal2019-03-019-194/+111
| * | netfilter: nf_tables: nat: merge nft_masq protocol specific modulesFlorian Westphal2019-03-019-236/+168
| * | netfilter: nf_tables: nat: merge nft_redir protocol specific modulesFlorian Westphal2019-03-019-217/+143
| * | netfilter: xt_IDLETIMER: fix sysfs callback function typeSami Tolvanen2019-03-011-10/+4
| * | netfilter: nf_conntrack: ensure that CONNTRACK_LOCKS is power of 2Li RongQing2019-03-011-0/+1
| * | netfilter: nf_tables: check the result of dereferencing base_chain->statsLi RongQing2019-03-011-6/+8
| * | netfilter: bridge: Don't sabotage nf_hook calls for an l3mdev slaveDavid Ahern2019-03-011-1/+2
| * | ipvs: get sctphdr by sctphoff in sctp_csum_checkXin Long2019-03-011-5/+2
| * | netfilter: convert the proto argument from u8 to u16Li RongQing2019-03-013-7/+7
| * | netfilter: nft_tunnel: Add dst_cache supportwenxu2019-03-011-0/+7
| * | netfilter: conntrack: tcp: only close if RST matches exact sequenceFlorian Westphal2019-03-011-10/+40
| * | ipvs: change some data types from int to boolAndrea Claudi2019-03-015-18/+18
| * | netfilter: nft_set_hash: remove nft_hash_key()Pablo Neira Ayuso2019-02-271-11/+2
| * | netfilter: nft_set_hash: bogus element self comparison from deactivation pathPablo Neira Ayuso2019-02-271-1/+1
| * | netfilter: nft_set_hash: fix lookups with fixed size hash on big endianPablo Neira Ayuso2019-02-271-4/+19
| * | netfilter: remove unneeded switch fall-throughLi RongQing2019-02-272-2/+1
| * | netfilter: conntrack: avoid same-timeout updateFlorian Westphal2019-02-272-10/+9
| * | netfilter: nat: remove nf_nat_l3proto.h and nf_nat_core.hFlorian Westphal2019-02-2715-95/+60
| * | netfilter: nat: remove l3proto structFlorian Westphal2019-02-273-100/+0
| * | netfilter: nat: remove csum_recalc hookFlorian Westphal2019-02-273-14/+27