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,
Luciano Coelho <luciano.coelho@nokia•com>,
Eric Dumazet <eric.dumazet@gmail•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org
Subject: linux-next: manual merge of the wireless tree with the net tree
Date: Fri, 9 Jul 2010 11:51:19 +1000 [thread overview]
Message-ID: <20100709115119.6c88f8d2.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/wl12xx/wl1271_cmd.h between commit
ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed
annotation") from the net tree and commit
34dd2aaac4a4b908c093980a9894fd878aeb6deb ("wl1271: moved scan operations
to a separate file") from the wireless tree.
I didn't bother changing __attribute((packed)) to __packed where this
code has been moved to. Maybe someone could write a patch to do that ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-07-09 1:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-09 1:51 Stephen Rothwell [this message]
2010-07-09 9:59 ` linux-next: manual merge of the wireless tree with the net tree Luciano Coelho
-- strict thread matches above, loose matches on Subject: below --
2011-08-19 0:59 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-21 2:04 Stephen Rothwell
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=20100709115119.6c88f8d2.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=luciano.coelho@nokia$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/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