mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-28 20:37:27 +00: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> |
||
|---|---|---|
| .. | ||
| android | ||
| asus_oled | ||
| bcm | ||
| comedi | ||
| cptm1217 | ||
| crystalhd | ||
| cxt1e1 | ||
| echo | ||
| et131x | ||
| frontier | ||
| ft1000 | ||
| iio | ||
| keucr | ||
| line6 | ||
| media | ||
| mei | ||
| nvec | ||
| octeon | ||
| olpc_dcon | ||
| omapdrm | ||
| ozwpan | ||
| panel | ||
| phison | ||
| quatech_usb2 | ||
| quickstart | ||
| ramster | ||
| rtl8187se | ||
| rtl8192e | ||
| rtl8192u | ||
| rtl8712 | ||
| rts5139 | ||
| rts_pstor | ||
| sbe-2t3e3 | ||
| sep | ||
| serial | ||
| serqt_usb2 | ||
| slicoss | ||
| sm7xx | ||
| speakup | ||
| ste_rmi4 | ||
| telephony | ||
| tidspbridge | ||
| usbip | ||
| vme | ||
| vt6655 | ||
| vt6656 | ||
| winbond | ||
| wlags49_h2 | ||
| wlags49_h25 | ||
| wlan-ng | ||
| xgifb | ||
| zcache | ||
| zram | ||
| zsmalloc | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||