From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Eric Dumazet <eric.dumazet@gmail•com>,
Wey-Yi Guy <wey-yi.w.guy@intel•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org
Subject: linux-next: manual merge of the wireless tree with the net tree
Date: Wed, 21 Jul 2010 12:04:40 +1000 [thread overview]
Message-ID: <20100721120440.46679304.sfr@canb.auug.org.au> (raw)
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-commands.h between commit
ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed
annotation") from the net tree and commit
7c094c5cc4d28062abf0d33ca022dbea6c522558 ("iwlwifi: additional statistic
debug counter") from the wireless tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
index 8d2db9d,83247f7..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@@ -3035,8 -3035,9 +3035,9 @@@ struct iwl39_statistics_tx
struct statistics_dbg {
__le32 burst_check;
__le32 burst_count;
- __le32 reserved[4];
+ __le32 wait_for_silence_timeout_cnt;
+ __le32 reserved[3];
-} __attribute__ ((packed));
+} __packed;
struct iwl39_statistics_div {
__le32 tx_on_a;
next reply other threads:[~2010-07-21 2:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-21 2:04 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-19 0:59 linux-next: manual merge of the wireless tree with the net tree Stephen Rothwell
2011-08-19 1:03 ` John W. Linville
2011-06-23 2:47 Stephen Rothwell
2011-05-19 1:02 Stephen Rothwell
2010-07-09 1:51 Stephen Rothwell
2010-07-09 9:59 ` Luciano Coelho
2010-06-23 2:51 Stephen Rothwell
2010-06-04 1:48 Stephen Rothwell
2010-06-04 6:14 ` Luciano Coelho
2010-04-12 4:05 Stephen Rothwell
2010-02-16 1:01 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=20100721120440.46679304.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=wey-yi.w.guy@intel$(echo .)com \
/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