diff mbox

wrong merge of rt2x00/rt2800pci.c in linux-next

Message ID 527A86D6.1030807@hauke-m.de (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Hauke Mehrtens Nov. 6, 2013, 6:13 p.m. UTC 
Hi,

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:

Hauke

 			break;
 		}
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Stephen Rothwell Nov. 6, 2013, 8:41 p.m. UTC | #1 
Hi,

On Wed, 06 Nov 2013 19:13:42 +0100 Hauke Mehrtens <hauke@hauke-m.de> 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.
diff mbox

Patch

--- a/drivers/net/wireless/rt2x00/rt2800mmio.c
+++ b/drivers/net/wireless/rt2x00/rt2800mmio.c
@@ -446,7 +446,7 @@  static void rt2800mmio_txstatus_interrupt(struct
rt2x00_dev *rt2x00dev)
 		if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))
 			break;

-		if (!kfifo_put(&rt2x00dev->txstatus_fifo, &status)) {
+		if (!kfifo_put(&rt2x00dev->txstatus_fifo, status)) {
 			rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status
report\n");