On Sun, Sep 30, 2012 at 9:15 PM, Fengguang Wu <fengguang.wu@xxxxxxxxx> wrote: > FYI, kernel build failed on > > tree: git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-next > head: c99517cda3548a0e270d374fe97d589d38022b80 > commit: 431ee27496b84effaaff9d21f0aae7c68015deeb [37/52] mlx4_core: Stash PCI ID driver_data in mlx4_priv structure > config: x86_64-allmodconfig > > All error/warnings: > > In file included from drivers/net/ethernet/mellanox/mlx4/alloc.c:42:0: > drivers/net/ethernet/mellanox/mlx4/mlx4.h:695:1: error: expected identifier or '(' before '<<' token Thanks, managed to leave a conflict marker in when I merged up to 3.6-rc7. Should be fixed now. -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html