David Miller <[email protected]> writes: > From: Kalle Valo <[email protected]> > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
