The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x d516b187a9cc2e842030dd005be2735db3e8f395 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024080700-felt-tip-cupped-5224@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: d516b187a9cc ("r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY") 93882c6f210a ("r8169: switch from netif_xxx message functions to netdev_xxx") b8447abc4c8f ("r8169: factor out rtl8169_tx_map") 2864a883f931 ("r8169: use pci_status_get_and_clear_errors") 90760b21aef4 ("r8169: add PCI_STATUS_PARITY to PCI status error bits") 9020845fb5d6 ("r8169: improve rtl8169_start_xmit") f1f9ca287569 ("r8169: improve rtl8169_get_mac_version") a8ec173a3f29 ("r8169: don't set min_mtu/max_mtu if not needed") 2992bdfa4ad2 ("r8169: add r8169.h") 1c5be5e91d78 ("r8169: rename rtl_apply_firmware") 8cecc8f0ae2e ("r8169: change argument type of EEE PHY functions") becd837eebc5 ("r8169: prepare for exporting rtl_hw_phy_config") af7797785d61 ("r8169: move enabling EEE to rtl8169_init_phy") 3127f7c9b7da ("r8169: factor out rtl8168h_2_get_adc_bias_ioffset") 229c1e0dfd3d ("r8169: load firmware for RTL8168fp/RTL8117") 718af5bc9709 ("r8169: improve conditional firmware loading for RTL8168d") d0db136ffb59 ("r8169: use r8168d_modify_extpage in rtl8168f_config_eee_phy") 1287723aa139 ("r8169: add support for RTL8117") 0721914a3d2b ("r8169: add helper r8168d_modify_extpage") 3a129e3f9ac4 ("r8169: switch to phylib functions in more places") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
