• J
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 0ca8d3ca
    Jakub Kicinski 提交于
    Build failure in drivers/net/wwan/mhi_wwan_mbim.c:
    add missing parameter (0, assuming we don't want buffer pre-alloc).
    
    Conflict in drivers/net/dsa/sja1105/sja1105_main.c between:
      589918df ("net: dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too")
      0fac6aa0 ("net: dsa: sja1105: delete the best_effort_vlan_filtering mode")
    
    Follow the instructions from the commit message of the former commit
    - removed the if conditions. When looking at commit 589918df ("net:
    dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too")
    note that the mask_iotag fields get removed by the following patch.
    Signed-off-by: NJakub Kicinski <kuba@kernel.org>
    0ca8d3ca
sja1105_main.c 93.7 KB