From: "Grumbach, Emmanuel" <emmanuel.grumbach@intel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
"John W. Linville" <linville@tuxdriver•com>
Cc: "linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>
Subject: RE: linux-next: manual merge of the wireless-next tree with Linus' tree
Date: Wed, 23 Jan 2013 20:18:33 +0000 [thread overview]
Message-ID: <0BA3FCBA62E2DC44AF3030971E174FB301922C4B@HASMSX103.ger.corp.intel.com> (raw)
In-Reply-To: <20130123121635.f9d10701019ad76297799d68@canb.auug.org.au>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/iwlwifi/dvm/tx.c between commit f590dcec9445
> ("iwlwifi: fix the reclaimed packet tracking upon flush queue") from Linus' tree
> and commit 1c3fea82d6eb ("iwlwifi: improve the reports in TX
> path") from the wireless-next tree.
>
> diff --cc drivers/net/wireless/iwlwifi/dvm/tx.c
> index 31534f7,b0aad71..0000000
> --- a/drivers/net/wireless/iwlwifi/dvm/tx.c
> +++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
> @@@ -1218,14 -1205,8 +1210,15 @@@ int iwlagn_rx_reply_tx(struct iwl_priv
> freed++;
> }
>
> + if (tid != IWL_TID_NON_QOS) {
> + priv->tid_data[sta_id][tid].next_reclaimed =
> + next_reclaimed;
> + IWL_DEBUG_TX_REPLY(priv, "Next reclaimed
> packet:%d\n",
> + next_reclaimed);
> + }
> +
> - WARN_ON(!is_agg && freed != 1);
> + if (!is_agg && freed != 1)
> + IWL_ERR(priv, "Q: %d, freed %d\n", txq_id, freed);
>
This looks fine - thanks!
---------------------------------------------------------------------
A member of the Intel Corporation group of companies
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
next prev parent reply other threads:[~2013-01-23 20:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 1:16 linux-next: manual merge of the wireless-next tree with Linus' tree Stephen Rothwell
2013-01-23 20:18 ` Grumbach, Emmanuel [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-09 0:44 Stephen Rothwell
2024-10-09 6:43 ` Greg Kroah-Hartman
2024-10-09 6:51 ` Johannes Berg
2024-10-09 7:13 ` Greg Kroah-Hartman
2024-10-09 7:19 ` Johannes Berg
2024-10-09 7:27 ` Greg Kroah-Hartman
2024-10-09 8:30 ` Johannes Berg
2024-10-09 9:24 ` Greg Kroah-Hartman
2024-10-09 0:38 Stephen Rothwell
2023-09-26 1:54 Stephen Rothwell
2023-09-26 4:50 ` Greg Kroah-Hartman
2023-09-14 0:28 Stephen Rothwell
2022-10-19 16:23 Stephen Rothwell
2022-10-19 23:23 ` Jakub Kicinski
2022-10-19 17:14 ` Stephen Rothwell
2022-10-19 23:52 ` Jakub Kicinski
2022-10-26 12:40 ` Kalle Valo
2022-10-26 14:35 ` Kalle Valo
2022-10-26 14:50 ` Kalle Valo
2013-07-25 1:37 Stephen Rothwell
2011-11-22 3:20 Stephen Rothwell
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=0BA3FCBA62E2DC44AF3030971E174FB301922C4B@HASMSX103.ger.corp.intel.com \
--to=emmanuel.grumbach@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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