From: Chris Metcalf <cmetc...@tilera.com> Date: Sun, 1 Jul 2012 14:43:47 -0400
> The tree is at: > > git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git net > > Chris Metcalf (3): > net: tilegx driver bugfix (be explicit about percpu queue number) > tilegx net driver: handle payload data not in frags > tilegx net: use eth_hw_addr_random(), not random_ether_addr() These changes look fine, but when I pull from your tree I get tons of totally unrelated stuff and a merge conflict in this driver. Can you put together a clean pull against net-next? Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
