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> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| ahb.c | ||
| ani.c | ||
| ani.h | ||
| ath5k.h | ||
| attach.c | ||
| base.c | ||
| base.h | ||
| caps.c | ||
| debug.c | ||
| debug.h | ||
| desc.c | ||
| desc.h | ||
| dma.c | ||
| eeprom.c | ||
| eeprom.h | ||
| gpio.c | ||
| initvals.c | ||
| led.c | ||
| mac80211-ops.c | ||
| pci.c | ||
| pcu.c | ||
| phy.c | ||
| qcu.c | ||
| reg.h | ||
| reset.c | ||
| rfbuffer.h | ||
| rfgain.h | ||
| rfkill.c | ||
| sysfs.c | ||
| trace.h | ||