On Wed, 2019-04-17 at 13:17 +0300, Luca Coelho wrote: > On Wed, 2019-04-17 at 12:11 +0200, Michal Hocko wrote: > > Hi, > > which tree is this supposed to be applied on? It doesn't do apply > > on > > top > > of v5.1-rc4-3-gfd008d1a7a20. iwl_trans_pcie_sync_nmi doesn't exist > > in > > drivers/net/wireless/intel/iwlwifi/pcie/trans.c. iwl_trans_sync_nmi > > looks pretty similar. My patch massaging ended up with this. Please > > double check. It compiles and even boots. > > Ah, sorry, I didn't mention that that patch was supposed to apply on > top of wireless-drivers-next, which is on its way to v5.2. We have > other patches touching this function there, thus the conflict. Huh, I was confused. My patch actually applies on top of wireless- drivers, which has other patches that touch the same function on their way to v5.1 (but not there yet). -- Luca.
