Hi, On Wed, 06 Nov 2013 19:13:42 +0100 Hauke Mehrtens <hauke@xxxxxxxxxx> wrote: > > I was looking at linux-next-20131106 and the conflict in > drivers/net/wireless/rt2x00/rt2800pci.c was solved wrong. The function > rt2800pci_txstatus_interrupt() was moved from rt2800pci.c to > rt2800mmio_txstatus_interrupt() in rt2800mmio.c in commit > 8d03e77218ff4bc59e4645438acbd3c5c7e0f654 , the change done in > 3bbfe1d952cd4d2e29bfcb31f109b5d74d1aa847 should be done there. > > This should be added to the merge 749550cb657ae5fb896b3b33070ae48f37813d13: Thanks for that, I will add this as a merge fix patch today. Andrew, 3bbfe1d952cd4d2e29bfcb31f109b5d74d1aa847 is "kfifo API type safety" from your series. I am not sure how that merge conflict got by me - I have no memory of it. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpwKWsFR0OTA.pgp
Description: PGP signature
