From: Kalle Valo <kvalo@codeaurora.org>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2015-03-06
Date: Sat, 07 Mar 2015 09:18:58 +0200 [thread overview]
Message-ID: <87vbid1di5.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20150306.154639.1922888192237476633.davem@davemloft.net> (David Miller's message of "Fri, 06 Mar 2015 15:46:39 -0500 (EST)")
David Miller <davem@davemloft.net> writes:
> From: Kalle Valo <kvalo@codeaurora.org>
> Date: Fri, 06 Mar 2015 19:08:10 +0200
>
>> here's a pull request for net-next. Lots of smaller fixes and cleanup,
>> major changes are documented in the signed tag and available below
>>
>> Do note that I wasn't able compile net-next (commit 23375a0fd549) with
>> my config:
>>
>> wireless-drivers-next/include/net/switchdev.h:133: multiple definition of `netdev_switch_fib_ipv4_abort'
>> net/bridge/br.o:wireless-drivers-next/include/net/switchdev.h:133: first defined here
>> net/bridge/br_netlink.o: In function `netdev_switch_fib_ipv4_abort':
>> wireless-drivers-next/include/net/switchdev.h:133: multiple definition of `netdev_switch_fib_ipv4_abort'
>> net/bridge/br.o:wireless-drivers-next/include/net/switchdev.h:133: first defined here
>>
>> But this pull request should still merge to net-next without conflicts.
>
> Yeah I just applied a fix for that.
Thanks, net-next compiles now for me.
--
Kalle Valo
next prev parent reply other threads:[~2015-03-07 7:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-06 17:08 pull-request: wireless-drivers-next 2015-03-06 Kalle Valo
2015-03-06 20:46 ` David Miller
2015-03-07 7:18 ` Kalle Valo [this message]
2015-03-07 2:35 ` [PATCH net-next 0/2] build fixes for iwlwifi Eric W. Biederman
2015-03-07 2:36 ` [PATCH 1/2] iwlwifi: mvm: Fix the build of mvm/mac-ctxt.c with debugfs disabled Eric W. Biederman
2015-03-07 2:37 ` [PATCH net-next 2/2] iwlwifi: mvm: Fix the build of mvm/phy-ctxt.c " Eric W. Biederman
2015-03-07 7:27 ` [PATCH net-next 0/2] build fixes for iwlwifi Kalle Valo
2015-03-07 17:48 ` Grumbach, Emmanuel
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=87vbid1di5.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=davem@davemloft.net \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).