summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* samples/bpf: Add xdp_sample_pkts exampleToke Høiland-Jørgensen2018-06-273-0/+239
* trace_helpers.c: Add helpers to poll multiple perf FDs for eventsToke Høiland-Jørgensen2018-06-272-2/+50
* nfp: bpf: allow source ptr type be map ptr in memcpy optimizationJiong Wang2018-06-271-2/+3
* Merge branch 'Multipath-tests-for-tunnel-devices'David S. Miller2018-06-274-48/+427
|\
| * selftests: forwarding: README: Require diagramsPetr Machata2018-06-271-0/+2
| * selftests: forwarding: Test multipath tunnelingPetr Machata2018-06-271-0/+354
| * selftests: forwarding: lib: Extract interface-init functionsPetr Machata2018-06-271-7/+25
| * selftests: forwarding: tc_rule_stats_get: Parameterize directionPetr Machata2018-06-271-2/+3
| * selftests: forwarding: multipath_eval(): Improve stylePetr Machata2018-06-271-35/+39
| * selftests: forwarding: Move multipath_eval() to lib.shPetr Machata2018-06-272-39/+39
|/
* net/tls: Remove VLA usage on nonceKees Cook2018-06-271-2/+8
* selftests: forwarding: mirror_gre_vlan_bridge_1q: Unset rp_filterPetr Machata2018-06-261-0/+9
* mdio-mux-gpio: Remove VLA usageKees Cook2018-06-261-8/+14
* Merge branch 'net-sched-support-replay-of-filter-offload-when-binding-to-block'David S. Miller2018-06-2623-46/+342
|\
| * net: sched: call reoffload op on block callback regJohn Hurley2018-06-263-12/+52
| * net: sched: cls_bpf: implement offload tcf_proto_opJohn Hurley2018-06-261-0/+39
| * net: sched: cls_u32: implement offload tcf_proto_opJohn Hurley2018-06-261-0/+111
| * net: sched: cls_matchall: implement offload tcf_proto_opJohn Hurley2018-06-261-0/+32
| * net: sched: cls_flower: implement offload tcf_proto_opJohn Hurley2018-06-262-0/+59
| * net: sched: add tcf_proto_op to offload a ruleJohn Hurley2018-06-262-3/+6
| * net: sched: pass extack pointer to block binds and cb registrationJohn Hurley2018-06-2617-31/+43
|/
* Merge branch 'sh_eth-RPADIR-related-clean-ups'David S. Miller2018-06-262-10/+2
|\
| * sh_eth: remove sh_eth_cpu_data::rpadir_valueSergei Shtylyov2018-06-262-8/+1
| * sh_eth: fix *enum* RPADIR_BITSergei Shtylyov2018-06-261-2/+1
|/
* r8169: reject unsupported WoL optionsHeiner Kallweit2018-06-261-1/+4
* selftests: net: Test headroom handling of ip6_gre devicesPetr Machata2018-06-261-0/+65
* Merge branch 'l2tp-trivial-cleanups'David S. Miller2018-06-264-32/+5
|\
| * l2tp: make l2tp_xmit_core() return voidGuillaume Nault2018-06-261-4/+2
| * l2tp: avoid duplicate l2tp_pernet() callsGuillaume Nault2018-06-261-2/+1
| * l2tp: don't export l2tp_tunnel_closeall()Guillaume Nault2018-06-262-3/+1
| * l2tp: don't export l2tp_session_queue_purge()Guillaume Nault2018-06-262-3/+1
| * l2tp: remove l2tp_tunnel_priv()Guillaume Nault2018-06-261-7/+0
| * l2tp: remove .show from struct l2tp_tunnelGuillaume Nault2018-06-262-6/+0
| * l2tp: remove pppol2tp_session_close()Guillaume Nault2018-06-261-7/+0
|/
* Merge branch 'DPAA-PTP-clock-and-timestamping'David S. Miller2018-06-2626-115/+361
|\
| * dpaa_eth: add the get_ts_info interface for ethtoolYangbo Lu2018-06-261-0/+39
| * dpaa_eth: add support for hardware timestampingYangbo Lu2018-06-262-5/+86
| * fsl/fman: define frame description command UPDYangbo Lu2018-06-261-0/+1
| * fsl/fman_port: support getting timestampYangbo Lu2018-06-262-0/+14
| * fsl/fman: add set_tstamp interfaceYangbo Lu2018-06-268-0/+60
| * arm64: dts: fsl: move ptp timer out of fmanYangbo Lu2018-06-261-6/+8
| * powerpc/mpc85xx: move ptp timer out of fman in dtsYangbo Lu2018-06-265-30/+40
| * dt-binding: ptp_qoriq: add DPAA FMan supportYangbo Lu2018-06-262-27/+13
| * ptp: support DPAA FMan 1588 timer in ptp_qoriqYangbo Lu2018-06-263-46/+98
| * fsl/fman: share the event interruptYangbo Lu2018-06-261-1/+2
|/
* Merge branch 'mlxsw-Support-bridge-router-interfaces-with-non-default-VLAN'David S. Miller2018-06-265-14/+323
|\
| * selftests: forwarding: Test routed bridge interfacePetr Machata2018-06-262-0/+245
| * mlxsw: spectrum_switchdev: Ban PVID change if bridge has a RIFPetr Machata2018-06-261-2/+45
| * mlxsw: spectrum_router: Add mlxsw_sp_rif_fid()Petr Machata2018-06-262-0/+6
| * mlxsw: spectrum_router: Publish mlxsw_sp_rif_find_by_dev()Petr Machata2018-06-262-5/+3