From: Hauke Mehrtens <hauke@hauke-m.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: stefani@seibold.net, Gabor Juhos <juhosg@openwrt.org>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
Linux-Next <linux-next@vger.kernel.org>
Subject: wrong merge of rt2x00/rt2800pci.c in linux-next
Date: Wed, 06 Nov 2013 19:13:42 +0100 [thread overview]
Message-ID: <527A86D6.1030807@hauke-m.de> (raw)
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
--- 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");
break;
}
next reply other threads:[~2013-11-06 18:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-06 18:13 Hauke Mehrtens [this message]
2013-11-06 20:41 ` wrong merge of rt2x00/rt2800pci.c in linux-next Stephen Rothwell
2013-11-06 21:05 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=527A86D6.1030807@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=juhosg@openwrt.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stefani@seibold.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox