linux-next: manual merge of the net tree with Linus' tree
in [Kernel]
|
Prev: [PATCH] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
Next: coda: Clean-up whitespace problems in pioctl.c
From: Stephen Rothwell on 16 May 2010 22:10 Hi all, Today's linux-next merge of the net tree got a conflict in include/linux/if_link.h between commit c02db8c6290bb992442fec1407643c94cc414375 ("rtnetlink: make SR-IOV VF interface symmetric") from Linus' tree and commit 10708f37ae729baba9b67bd134c3720709d4ae62 ("net: core: add IFLA_STATS64 support") from the net tree. Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc include/linux/if_link.h index d94963b,cfd420b..0000000 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@@ -79,7 -111,11 +111,8 @@@ enum IFLA_NET_NS_PID, IFLA_IFALIAS, IFLA_NUM_VF, /* Number of VFs if device is SR-IOV PF */ - IFLA_VF_MAC, /* Hardware queue specific attributes */ - IFLA_VF_VLAN, - IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ - IFLA_VFINFO, + IFLA_VFINFO_LIST, + IFLA_STATS64, __IFLA_MAX }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: David Miller on 17 May 2010 01:30 From: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Mon, 17 May 2010 12:09:22 +1000 > Hi all, > > Today's linux-next merge of the net tree got a conflict in > include/linux/if_link.h between commit > c02db8c6290bb992442fec1407643c94cc414375 ("rtnetlink: make SR-IOV VF > interface symmetric") from Linus' tree and commit > 10708f37ae729baba9b67bd134c3720709d4ae62 ("net: core: add IFLA_STATS64 > support") from the net tree. > > Just context changes. I fixed it up (see below) and can carry the fix > for a while. I'll merge net-2.6 into net-next-2.6 to fix this for you, and in fact your merge is exactly what I will use. Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 17 May 2010 02:30
Hi Dave, On Sun, 16 May 2010 22:28:03 -0700 (PDT) David Miller <davem(a)davemloft.net> wrote: > > I'll merge net-2.6 into net-next-2.6 to fix this for you, and > in fact your merge is exactly what I will use. Great, thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |