[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20150306.154639.1922888192237476633.davem@davemloft.net>
Date: Fri, 06 Mar 2015 15:46:39 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: kvalo@...eaurora.org
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2015-03-06
From: Kalle Valo <kvalo@...eaurora.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.
> Please let me know if you have any problems.
Pulled, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists