b1de0f01b0115575982cf24c88b35106449e9aa7 batman-adv: Use netif_rx_any_context(). 93bde210c4341e79f0cd9cb160d889f4577e40b1 sch_htb: Fix select_queue for non-offload mode fb3a3e37de337ec2941c71ff0bcb83e701f3c9f4 sch_htb: Fix offload cleanup in htb_destroy on htb_init failure 451b2596f54101103530c9d385e8ee08403c8d4e Merge branch 'htb-fixes' f4dae54e486d528d4dd98df116e7a522bbf12667 tcp: plug skb_still_in_host_queue() to TSQ a7abf3cd76e1e190a2c22afe5ffd0f695c7641b0 tcp: consider using standard rtx logic in tcp_rcv_fastopen_synack() ac3959fd0dcc0e49298ea5cadfe257db0e58ef8b tcp: remove obsolete check in __tcp_retransmit_skb() 5215206d8b1574c4ba8915a61fe841c376d51ed2 Merge branch 'tcp-delayed-completions' ed0907e3bdcfc7fe1c1756a480451e757b207a69 ice: fix napi work done reporting in xsk path a86606268ec0c809f341cda3771ae53460e064ab i40e: move headroom initialization to i40e_configure_rx_ring 89861c485c6a384e298fb78660d6a773339e42b1 ice: move headroom initialization to ice_setup_rx_ctx 76064573b121a376fe54a2799ee6b5bb91632a1f ixgbe: move headroom initialization to ixgbe_configure_rx_ring 98dfb02aa22280bd8833836d1b00ab0488fa951f igb: avoid premature Rx buffer reuse 080bfa1e6d928a5d1f185cc44e5f3c251df06df5 Revert "net: bonding: fix error return code of bond_neigh_init()" f211ac154577ec9ccf07c15f18a6abf0d9bdb4ab net: correct sk_acceptq_is_full() bfdfe7fc1bf9e8c16e4254236c3c731bfea6bdc5 docs: networking: phy: Improve placement of parenthesis 0142f09764752de8df211a42f0733531f96f4626 net/mlx5: DR, Fixed typo in STE v0 1412477882470bf72763e105e735bbec232b126f net/mlx5: DR, Remove unneeded rx_decap_l3 function for STEv1 cc82a2e6c8af956d894fa58a040dc0d532dd9978 net/mlx5: DR, Add missing vhca_id consume from STEv1 ad2c99ca758126bac9f4c198e8e231e9e7d375dd net/mlx5: use kvfree() for memory allocated with kvzalloc() 7976092241645be4d7ee46ebc894b29a74351daa net/mlx5: remove unneeded semicolon 093bd764693711667e7f0dfd95dfa1b938efcec9 net/mlx5: Read congestion counters from all ports when lag is active bca08a9145015d14e285dc4c24614dd5212ffb8d net/mlx5e: Remove redundant newline in NL_SET_ERR_MSG_MOD 991b2654605b455a94dac73e14b23480e7e20991 net/mlx5e: Use net_prefetchw instead of prefetchw in MPWQE TX datapath e16cf9d754b93b0cb715ebb981e57cae200c19c9 net/mlx5e: Dump ICOSQ WQE descriptor on CQE with error events 2119bda642c49c732409574ce699e4845e95df48 net/mlx5e: allocate 'indirection_rqt' buffer dynamically 287e0df021e877c2aa5f4750b2a0575070471ddb net/mlx5: Display the command index in command mailbox dump 69e2916ebce4410c0f6ba6c59c4f6e9eb228e5ec net/mlx5: CT: Add support for mirroring a3222a2da0a2d6c7682252d4bfdff05721a82b95 net/mlx5e: Allow to match on ICMP parameters c232f81b0a00f01c7dd1f888b806637c0d4b3d68 Merge tag 'mlx5-updates-2021-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 8fab174b78f74f10e4d900fe6da6c9047b0b35b5 net: macb: poll for fixed link state in SGMII mode e276e5e40e92582db3814d8b2b28150862c7a50f net: macb: Disable PCS auto-negotiation for SGMII fixed-link mode 26d2e0426aacaf4c128dc57111f0d460ab20e8b5 Merge branch 'macb-fixed-link-fixes' ab4dda7a8cb7e55ea3d92fd5e249cf6f5396028c dt-bindings: net: bcm4908-enet: add optional TX interrupt 12bb508bfe5a564c36864b12253db23cac83bfa1 net: broadcom: bcm4908_enet: support TX interrupt 59cd4f19267a0aab87a8c07e4426eb7187ee548d net: axienet: Fix probe error cleanup 6897087323a2fde46df32917462750c069668b2f ftgmac100: Restart MAC HW once b1dd9bf688b0dcc5a34dca660de46c7570bd9243 net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M 2e5de7e0c8d2caa860e133ef71fc94671cb8e0bf mptcp: fix bit MPTCP_PUSH_PENDING tests c3b8e07909dbe67b0d580416c1a5257643a73be7 net: dsa: mt7530: setup core clock even in TRGMII mode 6ad086009f87f65043c2a2c0efa27e3915c50e6e net: ipv4: route.c: Fix indentation of multi line comment. 01488a0ccd9abe15565bed50a45afcddbb0fe199 net: dsa: bcm_sf2: store PHY interface/mode in port structure a9349f08ec6c1251d41ef167d27a15cc39bc5b97 net: dsa: bcm_sf2: setup BCM4908 internal crossbar 257382c54e8cf33042f184f24d5c9d739e1f48cb ptp_pch: Remove unused function 'pch_ch_control_read()' f90fc37f289cd0886ef3a12b2ea33b93b8d9d360 ptp_pch: Move 'pch_*()' prototypes to shared header 9ec04c71ab206dbc95c79abdfc647df965a2cb91 ptp: ptp_clockmatrix: Demote non-kernel-doc header to standard comment 287f93ded67f48fd7126ee37e98103c6cf52eb0f ptp: ptp_p: Demote non-conformant kernel-doc headers and supply a param description b202923d3a93296c2e2627eee0222dfef3606777 Merge branch 'ptp-warnings' 86927c9c4d4e59b75a680f1e7922dca717cba24d netdevsim: fib: Introduce a lock to guard nexthop hashtable 40ff83711f76d30265140827b46066dd3db2db79 netdevsim: Create a helper for setting nexthop hardware flags d8eaa4facacbb13425d4097bd066e28958a5716f netdevsim: Add support for resilient nexthop groups c6385c0b67c527b298111775bc89a7407ba1581e netdevsim: Allow reporting activity on nexthop buckets 8e815284a5f9351973a5860447941823acf1182d selftests: fib_nexthops: Declutter test output a8f9952d218d816ff1a13c9385edd821a8da527d selftests: fib_nexthops: List each test case in a different line 557205f47dc47afeaf80707845cda8ec79ea4cb0 selftests: fib_nexthops: Test resilient nexthop groups 386e3792b52a4d815aefb30d8c049484dce7bdd2 selftests: forwarding: Add resilient hashing test 902280cacc0367dcaa8be8261e02ead932a1488d selftests: forwarding: Add resilient multipath tunneling nexthop test b8a07c4cea04c14008f34880424852d38ae03758 selftests: netdevsim: Add test for resilient nexthop groups offload API e9e90a70cc2d5690b84c7ca2f604e09a85222bb1 Merge branch 'resil-nhgroups-netdevsim-selftests' 6445e17af7c58b8a9be8ebf400b04c65202f6497 mptcp: add rm_list in mptcp_out_options cbde2787189632160a2fc09786d17648a8b191c5 mptcp: add rm_list_tx in mptcp_pm_data 5c4a824dcb589f3da2574dd99e761063e7d5529d mptcp: add rm_list in mptcp_options_received b5c55f334c7f75b59b2d14be0abb7c827a016059 mptcp: add rm_list_rx in mptcp_pm_data d0b698ca9a27e90b641804fc2fb49ae3719c0904 mptcp: remove multi addresses in PM ddd14bb85dd8d26e10a2ce4f9606879b94e81888 mptcp: remove multi subflows in PM 06faa22710342bca5e9c249634199c650799fce6 mptcp: remove multi addresses and subflows in PM 0e4a3e68862b7844c87126628082ae97c066b9da mptcp: remove a list of addrs when flushing 7028ba8ac9683b7e4f4db4db63a306d7497e7150 selftests: mptcp: add invert argument for chk_rm_nr f87744ad42446c8510296f11fdc73f6e6f1376cc selftests: mptcp: set addr id for removing testcases d2c4333a801c73a8bc2e4bde75b573e2d1014436 selftests: mptcp: add testcases for removing addrs 7c678829efa89e23a8556f5e4d9621c51995fb6e Merge branch 'mptcp-Include-multiple-address-ids-in-RM_ADDR' bc9d992ca4d240657dba8fe722ce327bd743b35f sh_eth: rename TRSCER bits 4585b72d97cc9f50b29a3c9774222c09fed92240 sh_eth: rename PSR bits e2dccaf194dd81f4cb7fcc2b8effc10a83302a48 sh_eth: rename *enum*s still not matching register names 0deaeabf271262f0b13a23b49fb1c7e9b9bcbd50 sh_eth: place RX/TX descriptor *enum*s after their *struct*s 5ab6f96a12f4f28d5a283dcf46b004cc653246a1 Merge branch 'sh_eth-reg-defs' a673321aa74fc5604643d6a4653684c0bc9fa617 selftests: mptcp: Restore packet capture option in join tests 6afa455e6153bcbde879dd408f7ac83668b0ac4a ibmvnic: update MAINTAINERS 47251a36e1361396862f108d5cfee7162c9513d3 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git /tnguy/net-queue f5f2b3e4dcc0e944dc33b522df84576679fbd8eb net: hns3: add support for imp-controlled PHYs 57a8f46b1bd3f5f43b06f48aab7c1f7ca0936be3 net: hns3: add get/set pause parameters support for imp-controlled PHYs 024712f51e5711d69ced729fb3398819ed6e8b53 net: hns3: add ioctl support for imp-controlled PHYs b47cfe1f402dbf10279b8f12131388fdff9d2259 net: hns3: add phy loopback support for imp-controlled PHYs 4849d9beb8c9dc2cc6ebd5d6f1eead944e1a52cf Merge branch 'hns3-imp-phys' 25660156f4cc4cf0cb55deda69f999dab554b750 flow_offload: add support for packet-per-second policing 6a56e19902af01da447cd3104d5a6e8d01792ee1 flow_offload: reject configuration of packet-per-second policing in offload drivers 2ffe0395288aa237ff7e0143366bd1cd57bfc5b7 net/sched: act_police: add support for packet-per-second policing 361f7e4a7501aad686128e8b1d18783667a4617a Merge branch 'pps-policing' 3a9ef3e11c5d33e5cb355b4aad1a4caad2407541 net: ipa: terminate message handler arrays ebc71a3804350b3ed8d730e3d68515e2e183fd99 Merge tag 'batadv-next-pullrequest-20210312' of git://git.open-mesh.org/linux-merge ba2d1c28886ceacd7da96466529f7929eaf3a498 net: dsa: hellcreek: Add devlink VLAN region e81813fb56350641d8d3ba6bb6811ecaab934f10 net: dsa: hellcreek: Use boolean value eb5f3d3141805fd22b2fb49a23536cc3f30dd752 net: dsa: hellcreek: Move common code to helper 292cd449fee3a67541fab2626efb8af6a72b4c69 net: dsa: hellcreek: Add devlink FDB region b8eccf2a0dc98f400dd48b6538c8f000544b96d8 Merge branch 'dsa-hewllcreek-dumps' 65c7bc1b7a66f2cb0bafcefd9e15e1de44ac7ea7 net: ethernet: marvell: Fixed typo in the file sky2.c 6fadbdd6dd3260120bde3f2e471125d4fbce168c drivers: net: vxlan.c: Fix declaration issue e127906b68b49ddb3ecba39ffa36a329c48197d3 net: stmmac: Set FIFO sizes for ipq806x ad236ccde19a93309cba25fb8c9e789b9c69397c devlink: fix typo in documentation 3cc9b29ac0e1739091ccfe9ada2ffdd230312f2e docs: net: tweak devlink health documentation 6f1629093399303bf19d6fcd5144061d1e25ec23 docs: net: add missing devlink health cmd - trigger 431efd29fcc87b63e43f5f9394db8063d2dee48b Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux into net-next 4e17c0632d686ccf486b6c6397379964e6788a41 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux into net-next 5e1fd806e20b500c026f96ca5ff4fdbccc32737f Revert "net: bonding: fix error return code of bond_neigh_init()" 4f7994a03f07ecf781f69dd96e82f7090b737858 net/mlx5: Fix devlink reload LOCKDEP warning 5bb3e0151a7b19e08eefd94f95081fb5cacd68a5 net/mlx5: E-Switch, let user to enable disable metadata 5475b7733a9f6486e6decdffb75b54562f7655a4 net/mlx5: Don't allow health work when device is probing 56bb9b907cbeb29ee8147046566697a4cbad08b9 Revert "net/mlx5: Fix fatal error handling during device load" 62d49969d72fc1b2f958f80fe4cf0cad147b28d0 net/mlx5: SF: Fix memory leak of work item 89ee91b1232d39748ab2952947034c7e1ece1545 net/mlx5: SF: Fix error flow of SFs allocation flow d5e563a92e2e56e89295129e3344ee654730fc5d net/mlx5e: Enforce minimum value check for ICOSQ size 7fb30dc48cb8a40bb77f7701393a820a94dbb7c0 net/mlx5: DR, Fix potential shift wrapping of 32-bit value in STEv1 getter 38c015f15b0707719fc50208a5c0c39896cd1389 net/mlx5: Cleanup prototype warning ef700f2ea27e54f640c3957374469132e8bf46f5 samples: pktgen: allow to specify delay parameter via new opt c8fd4852022ca8ae85ac4d30d05950eaf506b828 samples: pktgen: new append mode 0f88e6f35b314500ba4c2f7d62c4598bf2c1229b Merge branch 'pktgen-scripts-improvements' bd49fea7586b9d39a38846e9ef4ac056e4eb6e59 hv_netvsc: Add a comment clarifying batching logic f4e6d7cdbfae502788bc468295b232dec76ee57e net: dsa: bcm_sf2: Fill in BCM4908 CFP entries 0ccf4d50d14f360dfae5b25b8ffcb27f98e591f0 gro: simplify gro_list_prepare() 9dc2c313378528afe1bddf12cad88dbfe0998820 gro: consistentify napi->gro_hash[x] access in dev_gro_receive() d0eed5c325149002c364a1439ae1afe1992beae4 gro: give 'hash' variable in dev_gro_receive() a less confusing name 3f79eb3c3a6abaa8f9900b5e40994060d7341cbc Merge branch 'gro-micro-optimize-dev_gro_receive' dac06b32c705dc8824479b03eee826b4f6615ab2 flow_dissector: constify bpf_flow_dissector's data pointers e3305138da47f0ae2241e5daa18af276e1e54457 skbuff: make __skb_header_pointer()'s data argument const f96533cded173b3b019001a505a746c3cd8fc323 flow_dissector: constify raw input data argument 805a25f3a1bdf4aafd0af412ce1e47d0cb6c7628 linux/etherdevice.h: misc trailing whitespace cleanup 59753ce8b196de60211a989c75ece8aeb0d9d57c ethernet: constify eth_get_headlen()'s data argument d206121faf8bb2239cd970af0bd32f5203780427 skbuff: micro-optimize {,__}skb_header_pointer() c6baf7eeb0cf82f6a90a703f6548250fc85cfdcc Merge branch 'skbuff-micro-optimize-flow-dissection' a03e99d39f1943ec88f6fd3b0b9f34c20663d401 psample: Encapsulate packet metadata in a struct 07e1a5809b595df6e125504dff6245cb2c8ed3de psample: Add additional metadata attributes a8700c3dd0a48f379d269ac6ddcf8bd857042771 netdevsim: Add dummy psample implementation f26b30918dac568425811f71fd21a53ed2307f44 selftests: netdevsim: Test psample functionality e0eeede3d23337382e328e0fea4f7794e5a959d2 mlxsw: pci: Add more metadata fields to CQEv2 d4cabaadeaad96ebaa415b6a7ca00390645a89ec mlxsw: Create dedicated field for Rx metadata in skb control block 5ab6dc9fa2720cbbbdf2686c06a90c9a6c86b6fd mlxsw: pci: Set extra metadata in skb control block e1f78ecdfd59d560c42bc04b9bfb746ef8a9dfb1 mlxsw: spectrum: Remove unnecessary RCU read-side critical section 48990bef1e6880613b142cea4f3962dd51458bd6 mlxsw: spectrum: Remove mlxsw_sp_sample_receive() 2073c600444349b18a80b0b38dc20df92fd74155 mlxsw: spectrum: Report extra metadata to psample module bb24d592e66eb059e086595510e0f0b064e4114d selftests: mlxsw: Add tc sample tests 2117fce81f6b862aac0673abe8df0c60dca64bfa Merge branch 'psample-Add-additional-metadata-attributes' db7284a6ccc4a6d7714645141f7dcee0fcb4e57d net: dsa: hellcreek: Offload bridge port flags 8f64860f8b567cc4f8ac854a65cbf6337404c520 net: export dev_set_threaded symbol acdff0df54264d187b648b80bc18265f0698f1ad bonding: Added -ENODEV interpret for slaves option 9cb24ea051857f2a7ab85c42842c5baa40497e53 atm: delete include/linux/atm_suni.h a7dde236b3173c54195900dd46ffc5730de1a216 ethernet: amazon: ena: A typo fix in the file ena_com.h 6f05a1224174a67a71a196e9e776b1ce72aa4a3d net: ethernet: intel: igb: Typo fix in the file igb_main.c 29c35da103471d7fc39839192bead60fbf3ba1f9 net: ethernet: neterion: Fix a typo in the file s2io.c 07a4bc51fc732b3618fd46dc51609948933064a4 net: pcs: rearrange C73 functions to prepare for C37 support later b97b5331b8ab7f60fb880e0c31c9b09b73d2fa4e net: pcs: add C37 SGMII AN support for intel mGbE controller ab39385021d1e0b4cd6cc521dc35c2fe659bbddf net: phylink: make phylink_parse_mode() support non-DT platform e5e5b771f684c22b25c67df85d2deb43901f7b95 net: stmmac: make in-band AN mode parsing is supported for non-DT c62808e8105f6a0872ac716c0030e97af81e4cf0 net: stmmac: ensure phydev is attached to phylink for C37 AN 7310fe538ea5c966a773cbc39272ef145f8d05ae stmmac: intel: add pcs-xpcs for Intel mGbE controller 91de5ac99a6e53ade273722b3335bba1c262899d Merge branch 'net-pcs-stmmac=add-C37-AN-SGMII-support' 5ec55823438e850c91c6b92aec93fb04ebde29e2 net: stmmac: add clocks management for gmac driver b4d45aee6635197d257f3469413837cd94fc11f4 net: stmmac: add platform level clocks management 8f2f83765eb0c402fdf77bc8a81d6435b5aa98b7 net: stmmac: dwmac-imx: add platform level clocks management for i.MX 63fe60596b9bff7d28bbfe9a3ca57ef77b8dcd26 Merge branch 'stmmac-clocks' 6e3bac3eba448a438840ab8152cb8bbfcb8787b8 net: phy: add Marvell 88X2222 transceiver support 0f13b5e6bf283a086b6d5b47be1ecf05a341eb9b net: ipa: make ipa_table_hash_support() inline 252c6f54970decf17017631aba9e4cf36c91ce24 net/mlx5e: alloc the correct size for indirection_rqt 45f3a13c816656c9d3d311880d90286341644d9b net: qualcomm: rmnet: mark trailer field endianness 50c62a111c4855510b0d8a2d8e50214172166b61 net: qualcomm: rmnet: simplify some byte order logic 9d131d044f89a808f947d49f1a1865815c610158 net: qualcomm: rmnet: kill RMNET_MAP_GET_*() accessor macros 16653c16d282e768763b2e8cc78f75df8fd53992 net: qualcomm: rmnet: use masks instead of C bit-fields cc1b21ba6251c8dd8e4e86018c9fdba85df0d219 net: qualcomm: rmnet: don't use C bit-fields in rmnet checksum trailer 86ca860e12ec0feab7d721d3b05e60fb86613540 net: qualcomm: rmnet: don't use C bit-fields in rmnet checksum header 578ce0468f0b5ccc3771ce60fd77d408cd0f9b09 Merge branch 'net-qualcomm-rmnet-stop-using-C-bit-fields' 3071944efac2eb064767db9267afb25b5231976c net/mlx5e: Fix error path for ethtool set-priv-flag d4064c9cfcf2c990e80823b6669caa180e402e79 net/mlx5e: CT, Remove newline from ct_dbg call 7f99bac724aa50c0c4d26eddfa1d036fe603a543 net/mlx5e: Fix division by 0 in mlx5e_select_queue 98caddc733d31af5bf16482539dc67aa6c1c6651 net/mlx5: SF, do not use ecpu bit for vhca state processing c098f7e2c117b87ba4522d92654363e351397272 Merge branch 'patchq/382097' into mlx5-for-net cdb999e72e179e248d3fc8cbb7dd4cdcaf1f2d1d Merge branch 'patchq/379044' into mlx5-for-net fb3df13647aea5d839fd87214d8be5f507dafd38 Merge branch 'patchq/382368' into mlx5-for-net cb5542e1588f39fb5dbe3082e04cc6b813afc32f net/mlx5: Use ida_alloc_range() instead of ida_simple_alloc() bef53d3154794a23d5613fc73b1020fb18a5ecba net/mlx5e: Reject tc rules which redirect from a VF to itself 4e0e5a3a924fe170fc685c04309c2a7dd1154b44 net: Change dev parameter to const in netif_device_present() fee8d40a503465dd237cb964e5d5e038ee5ef9dc Revert "net/mlx5: E-Switch, let user to enable disable metadata" c89f55e0b5b397dbdb698ae25784ae4379dd51ab net/mlx5e: Same max num channels for both nic and uplink profiles fd963ab40bc670de3bd62fac8a162494df276573 net/mlx5e: Allow legacy vf ndos only if in legacy mode 6013d9a5be617db63730d7982efefca661b667af net/mlx5e: Distinguish nic and esw offload in tc setup block cb 25e2e0d41b0981dc3cb5588d2963b707a7c9d5dd net/mlx5e: Add offload stats ndos to nic netdev ops 22fc469b3ab6ad07f38140e9835289e633e3c803 net/mlx5e: Use nic mode netdev ndos and ethtool ops for uplink representor e543cf72b965eb94306682413127a42ebc19cbf1 net/mlx5e: Verify dev is present in some ndos c29f7870d04e64a197bba55d0076b722dea8d67e net/mlx5e: Move devlink port register and unregister calls c586efe40b2f499d7c43cb2bf25abccc91ca670f net/mlx5e: Register nic devlink port with switch id 692668e922c577521f2669a12d3a8b66d78001d7 net/mlx5: Move mlx5e hw resources into a sub object 87f6ae612d2703354458e74bd9362e192be29fdc net/mlx5: Move devlink port from mlx5e priv to mlx5e resources 712779e6514dd79a4def54b73c1e73e3a1d52464 net/mlx5e: Unregister eth-reps devices first d71da91a72d4b1520d38c731918f8d2d625b9afe net/mlx5e: Do not reload ethernet ports when changing eswitch mode cf2890ea25c6e865cf0aaebfb82b59156273f286 net/mlx5: E-Switch, Change mode lock from mutex to rw semaphore 3d60ff8fb3c1a5ebad42181f8210ce5e9aac75eb net/mlx5: E-Switch, Protect changing mode while adding rules 6a9b8331fd77724b0b07311b49898c4fa7e46a91 Merge branch 'patchq/382373' into mlx5-queue 7927b1d8eb8ce3db886b9f164626c4ab4d0807b6 Merge branch 'patchq/325542' into mlx5-queue 6b7e2910688ca56828b4f13878f395e33f838d3b Merge branch 'mlx4-queue' into net-next 1f170e841e67fb16052d3a120597385121e09b82 Merge branch 'mlx5-queue' into net-next 5cdeb10ff91562df1351568ac63a501849042bf3 Merge branch 'mlx4-for-net' into net-next 18dd2c8671fe023bdfb63af3af758583180b9a03 Merge branch 'mlx5-for-net' into net-next