summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: dsa: Be aware of switches where VLAN filtering is a global settingVladimir Oltean2019-04-302-7/+50
* net: dsa: Store vlan_filtering as a property of dsa_portVladimir Oltean2019-04-302-4/+9
* net: dsa: Fix pharse -> phase typoVladimir Oltean2019-04-301-1/+1
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2019-04-3032-1594/+1249
|\
| * xfrm: remove unneeded export_symbolsFlorian Westphal2019-04-234-9/+4
| * xfrm: remove decode_session indirection from afinfo_policyFlorian Westphal2019-04-234-232/+222
| * xfrm: remove init_path indirection from afinfo_policyFlorian Westphal2019-04-234-38/+7
| * xfrm: remove tos indirection from afinfo_policyFlorian Westphal2019-04-234-24/+3
| * xfrm: kconfig: make xfrm depend on inetFlorian Westphal2019-04-151-3/+5
| * xfrm: store xfrm_mode directly, not its addressFlorian Westphal2019-04-0813-55/+55
| * xfrm: make xfrm modes builtinFlorian Westphal2019-04-0820-493/+81
| * xfrm: remove afinfo pointer from xfrm_modeFlorian Westphal2019-04-087-14/+80
| * xfrm: remove output2 indirection from xfrm_modeFlorian Westphal2019-04-086-224/+207
| * xfrm: remove input2 indirection from xfrm_modeFlorian Westphal2019-04-087-173/+222
| * xfrm: remove gso_segment indirection from xfrm_modeFlorian Westphal2019-04-087-58/+78
| * xfrm: remove xmit indirection from xfrm_modeFlorian Westphal2019-04-086-60/+56
| * xfrm: remove output indirection from xfrm_modeFlorian Westphal2019-04-0812-128/+169
| * xfrm: remove input indirection from xfrm_modeFlorian Westphal2019-04-088-66/+72
| * xfrm: prefer family stored in xfrm_mode structFlorian Westphal2019-04-084-5/+5
| * xfrm: place af number into xfrm_mode structFlorian Westphal2019-04-089-52/+32
| * vti4: eliminated some duplicate code.Jeremy Sowden2019-03-241-38/+22
| * xfrm: gso partial offload supportBoris Pismenny2019-03-242-3/+10
* | net: phy: micrel: make sure the factory test bit is clearedAntoine Tenart2019-04-291-1/+14
* | net: phy: avoid unneeded MDIO reads in genphy_read_statusHeiner Kallweit2019-04-281-1/+5
* | Merge branch 'dsa-tag-modules'David S. Miller2019-04-2816-220/+380
|\ \
| * | dsa: Allow tag drivers to be built as modulesAndrew Lunn2019-04-282-29/+73
| * | dsa: tag_brcm: Avoid unused symbolsAndrew Lunn2019-04-281-2/+6
| * | dsa: Cleanup unneeded table and make tag structures staticAndrew Lunn2019-04-2812-77/+11
| * | dsa: Make use of the list of tag driversAndrew Lunn2019-04-281-5/+34
| * | dsa: Add stub tag driver put methodAndrew Lunn2019-04-284-0/+9
| * | dsa: Rename dsa_resolve_tag_protocol() to _get ready for lockingAndrew Lunn2019-04-284-4/+5
| * | dsa: Register the none tagger opsAndrew Lunn2019-04-281-0/+7
| * | dsa: Keep link list of tag driversAndrew Lunn2019-04-281-0/+28
| * | dsa: Add boilerplate helper to register DSA tag driver modulesAndrew Lunn2019-04-2811-2/+118
| * | dsa: Add TAG protocol to tag opsAndrew Lunn2019-04-2811-0/+13
| * | dsa: Add MODULE_LICENSE to tag driversAndrew Lunn2019-04-289-0/+9
| * | dsa: Add MODULE_ALIAS to taggers in preparation to become modulesAndrew Lunn2019-04-2810-13/+52
| * | dsa: Move tagger name into its ops structureAndrew Lunn2019-04-2811-43/+14
| * | dsa: Add SPDX header to tag drivers.Andrew Lunn2019-04-288-52/+8
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2019-04-2884-361/+4168
|\ \
| * \ Merge branch 'sk-local-storage'Alexei Starovoitov2019-04-2726-114/+2089
| |\ \
| | * | bpf: Add ene-to-end test for bpf_sk_storage_* helpersMartin KaFai Lau2019-04-273-16/+157
| | * | bpf: Add BPF_MAP_TYPE_SK_STORAGE test to test_mapsMartin KaFai Lau2019-04-274-10/+679
| | * | bpf: Add verifier tests for the bpf_sk_storageMartin KaFai Lau2019-04-272-19/+152
| | * | bpf: Refactor BTF encoding macro to test_btf.hMartin KaFai Lau2019-04-272-62/+70
| | * | bpf: Support BPF_MAP_TYPE_SK_STORAGE in bpf map probingMartin KaFai Lau2019-04-272-1/+74
| | * | bpf: Sync bpf.h to toolsMartin KaFai Lau2019-04-271-1/+43
| | * | bpf: Introduce bpf sk local storageMartin KaFai Lau2019-04-2712-5/+914
| |/ /
| * | Merge branch 'writeable-bpf-tracepoints'Alexei Starovoitov2019-04-2619-5/+433
| |\ \
| | * | selftests: bpf: test writable buffers in raw tpsMatt Mullins2019-04-265-0/+210