On 05/13/2014 09:43 AM, Marc Kleine-Budde wrote: > On 05/13/2014 07:14 AM, Oliver Hartkopp wrote: >> Hello Jet, >> >> this is likely not CAN related, as >> >> # CONFIG_CAN is not set >> >> and all the CAN changes introduced by Marc's merge are not even compiled in >> your setup. >> >> So I assume the issue somewhere in the netlink or ipv6 stuff (see commit at >> the end. > > Yes, I my merge is probably broken. That was an attempt to merge net > into net-next, but I'm going to ask David Miller to do so. As I'm going > to rebase this branch onto David's net-next (after the net merge), we > can ignore this for now. While I was asleep David merged net to net-master ;) I just rebased this branch and updated it. The oops should be gone now. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
