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> |
||
|---|---|---|
| .. | ||
| fs_enet | ||
| fec.c | ||
| fec.h | ||
| fec_mpc52xx.c | ||
| fec_mpc52xx.h | ||
| fec_mpc52xx_phy.c | ||
| fsl_pq_mdio.c | ||
| fsl_pq_mdio.h | ||
| gianfar.c | ||
| gianfar.h | ||
| gianfar_ethtool.c | ||
| gianfar_ptp.c | ||
| gianfar_sysfs.c | ||
| Kconfig | ||
| Makefile | ||
| ucc_geth.c | ||
| ucc_geth.h | ||
| ucc_geth_ethtool.c | ||