mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-24 09:25:45 +07:00
0d6c4a2e46
Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| b43.h | ||
| bus.c | ||
| bus.h | ||
| debugfs.c | ||
| debugfs.h | ||
| dma.c | ||
| dma.h | ||
| Kconfig | ||
| leds.c | ||
| leds.h | ||
| lo.c | ||
| lo.h | ||
| main.c | ||
| main.h | ||
| Makefile | ||
| pcmcia.c | ||
| pcmcia.h | ||
| phy_a.c | ||
| phy_a.h | ||
| phy_common.c | ||
| phy_common.h | ||
| phy_g.c | ||
| phy_g.h | ||
| phy_ht.c | ||
| phy_ht.h | ||
| phy_lcn.c | ||
| phy_lcn.h | ||
| phy_lp.c | ||
| phy_lp.h | ||
| phy_n.c | ||
| phy_n.h | ||
| pio.c | ||
| pio.h | ||
| radio_2055.c | ||
| radio_2055.h | ||
| radio_2056.c | ||
| radio_2056.h | ||
| radio_2059.c | ||
| radio_2059.h | ||
| rfkill.c | ||
| rfkill.h | ||
| sdio.c | ||
| sdio.h | ||
| sysfs.c | ||
| sysfs.h | ||
| tables_lpphy.c | ||
| tables_lpphy.h | ||
| tables_nphy.c | ||
| tables_nphy.h | ||
| tables_phy_ht.c | ||
| tables_phy_ht.h | ||
| tables_phy_lcn.c | ||
| tables_phy_lcn.h | ||
| tables.c | ||
| tables.h | ||
| wa.c | ||
| wa.h | ||
| xmit.c | ||
| xmit.h | ||