Prev: drivers/infiniband/hw/ehca: Drop unnecessary null test
Next: [GIT PULL] SLAB updates for 2.6.36-rc0
From: Linus Torvalds on 4 Aug 2010 15:10
On Tue, Aug 3, 2010 at 8:38 PM, David Miller <davem(a)davemloft.net> wrote:
>
> Another release, another merge window, another set of networking
> changes to merge :-)

Ok, merged. But you should double-check my merge resolution fixes,

I'm also a bit unhappy about how it introduces new warnings in very
subtle ways. I started wondering why the hell I suddenly had SCSI
warnings even though I hadn't pulled the SCSI tree yet. It was due to
the dev_printk() changes in commit 99bcf217183e0 (""), which ends up
causing things like

drivers/scsi/constants.c: In function �scsi_print_sense�:
drivers/scsi/constants.c:1407: warning: zero-length gnu_printf format string
drivers/scsi/constants.c:1413: warning: zero-length gnu_printf format string
drivers/scsi/constants.c: In function �scsi_print_result�:
drivers/scsi/constants.c:1456: warning: zero-length gnu_printf format string
...

which is a bit annoying. But more annoying was that you must have
known about this, and I'd have been much happier not seeing it as a
new surprise.

Linus
--
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 4 Aug 2010 18:00
From: David Miller <davem(a)davemloft.net>
Date: Wed, 04 Aug 2010 13:41:15 -0700 (PDT)

> From: Linus Torvalds <torvalds(a)linux-foundation.org>
> Date: Wed, 4 Aug 2010 12:06:47 -0700
>
>> On Tue, Aug 3, 2010 at 8:38 PM, David Miller <davem(a)davemloft.net> wrote:
>>>
>>> Another release, another merge window, another set of networking
>>> changes to merge :-)
>>
>> Ok, merged. But you should double-check my merge resolution fixes,
>
> Will do, thanks a lot.

I just double-checked everything and it all looks fine, thanks
again.
--
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: Yinghai Lu on 5 Aug 2010 22:10
On Wed, Aug 4, 2010 at 12:06 PM, Linus Torvalds
<torvalds(a)linux-foundation.org> wrote:
> On Tue, Aug 3, 2010 at 8:38 PM, David Miller <davem(a)davemloft.net> wrote:
>>
>> Another release, another merge window, another set of networking
>> changes to merge :-)
>
> Ok, merged. But you should double-check my merge resolution fixes,

CC drivers/net/ixgbe/ixgbe_main.o
drivers/net/ixgbe/ixgbe_main.c: In function �ixgbe_select_queue�:
drivers/net/ixgbe/ixgbe_main.c:6159: error: �struct ixgbe_fcoe� has no
member named �up�
drivers/net/ixgbe/ixgbe_main.c: In function �ixgbe_xmit_frame�:
drivers/net/ixgbe/ixgbe_main.c:6221: error: �struct ixgbe_fcoe� has no
member named �up�
make[1]: *** [drivers/net/ixgbe/ixgbe_main.o] Error 1
make: *** [drivers/net/ixgbe/] Error 2

YH
--
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: Linus Torvalds on 5 Aug 2010 22:20
On Thu, Aug 5, 2010 at 7:04 PM, Yinghai Lu <yinghai(a)kernel.org> wrote:
>
> �CC � � �drivers/net/ixgbe/ixgbe_main.o
> drivers/net/ixgbe/ixgbe_main.c: In function �ixgbe_select_queue�:
> drivers/net/ixgbe/ixgbe_main.c:6159: error: �struct ixgbe_fcoe� has no member named �up�

Hmm. You must have some other version of that file than I do. Line
6159 is in ixgbe_init_module() in my source tree.

Linus
--
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: Yinghai Lu on 6 Aug 2010 01:00
On 08/05/2010 07:15 PM, Linus Torvalds wrote:
> On Thu, Aug 5, 2010 at 7:04 PM, Yinghai Lu <yinghai(a)kernel.org> wrote:
>>
>> CC drivers/net/ixgbe/ixgbe_main.o
>> drivers/net/ixgbe/ixgbe_main.c: In function �ixgbe_select_queue�:
>> drivers/net/ixgbe/ixgbe_main.c:6159: error: �struct ixgbe_fcoe� has no member named �up�
>
> Hmm. You must have some other version of that file than I do. Line
> 6159 is in ixgbe_init_module() in my source tree.
>
> Linus

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=drivers/net/ixgbe/ixgbe_main.c;h=7d6a415bcf885633999e10ed795df49876d6c47e;hb=HEAD

6146 static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
6147 {
6148 struct ixgbe_adapter *adapter = netdev_priv(dev);
6149 int txq = smp_processor_id();
6150
6151 #ifdef IXGBE_FCOE
6152 if ((skb->protocol == htons(ETH_P_FCOE)) ||
6153 (skb->protocol == htons(ETH_P_FIP))) {
6154 if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {
6155 txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
6156 txq += adapter->ring_feature[RING_F_FCOE].mask;
6157 return txq;
6158 } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
6159 txq = adapter->fcoe.up;
6160 return txq;
6161 }
6162 }
6163 #endif
--
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/
 |  Next  |  Last
Pages: 1 2
Prev: drivers/infiniband/hw/ehca: Drop unnecessary null test
Next: [GIT PULL] SLAB updates for 2.6.36-rc0