From: Luciano Coelho <luciano.coelho@nokia.com>
To: ext Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Oikarinen Juuso (Nokia-D/Tampere)" <juuso.oikarinen@nokia.com>,
Eric Dumazet <eric.dumazet@gmail.com>,
David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: linux-next: manual merge of the wireless tree with the net tree
Date: Fri, 04 Jun 2010 09:14:24 +0300 [thread overview]
Message-ID: <1275632064.15894.18.camel@chilepepper> (raw)
In-Reply-To: <20100604114801.df31fb50.sfr@canb.auug.org.au>
On Fri, 2010-06-04 at 03:48 +0200, ext Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/wl12xx/wl1271.h
> drivers/net/wireless/wl12xx/wl1271_cmd.h between commit
> ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed
> annotation") from the net tree and commit
> eb70eb723b489dd4e233e22e47d993f59858cdd8 ("wl1271: Update handling of the
> NVS file / INI parameters") from the wireless tree.
>
> I fixed up some if it (see below) and can carry the fixes as necessary.
> The latter patch also moved some of the structures to another file
> (drivers/net/wireless/wl12xx/wl1271_ini.h), so they will need fixing up
> there.
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Thanks for the merge. I'll submit a new patch fixing the annotation
from the structs that were moved.
--
Cheers,
Luca.
next prev parent reply other threads:[~2010-06-04 6:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-04 1:48 linux-next: manual merge of the wireless tree with the net tree Stephen Rothwell
2010-06-04 1:48 ` Stephen Rothwell
2010-06-04 6:14 ` Luciano Coelho [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-19 0:59 Stephen Rothwell
2011-08-19 0:59 ` Stephen Rothwell
2011-08-19 1:03 ` John W. Linville
2011-06-23 2:47 Stephen Rothwell
2011-06-23 2:47 ` Stephen Rothwell
2011-05-19 1:02 Stephen Rothwell
2011-05-19 1:02 ` Stephen Rothwell
2010-07-21 2:04 Stephen Rothwell
2010-07-21 2:04 ` Stephen Rothwell
2010-07-09 1:51 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-23 2:51 ` Stephen Rothwell
2010-04-12 4:05 Stephen Rothwell
2010-04-12 4:05 ` Stephen Rothwell
2010-02-16 1:01 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=1275632064.15894.18.camel@chilepepper \
--to=luciano.coelho@nokia.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=juuso.oikarinen@nokia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.