From: Rakesh Ranjan <rakesh@chelsio.com>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James.Bottomley@HansenPartnership.com,
Rakesh Ranjan <rakesh@chelsio.com>
Subject: Re: linux-next: manual merge of the net-current tree with the scsi-rc-fixes tree
Date: Tue, 05 Jan 2010 10:39:31 +0530 [thread overview]
Message-ID: <4B42C98B.8070300@chelsio.com> (raw)
In-Reply-To: <20100104.143705.179916049.davem@davemloft.net>
On 01/05/2010 04:07 AM, David Miller wrote:
> From: Stephen Rothwell<sfr@canb.auug.org.au>
> Date: Tue, 5 Jan 2010 08:56:13 +1100
>
>> Today's linux-next merge of the net-current tree got a conflict in
>> drivers/scsi/cxgb3i/cxgb3i_offload.c between commit
>> 44214ab474671e1ab5a860954db413bce52f7e04 ("[SCSI] cxgb3i: Fix a login
>> over vlan issue") from the scsi-rc-fixes tree and commit
>> 52ee264bca378835decb827d18b1d90b709ca4c9 ("cxgb3i: Fix a login over vlan
>> issue") from the net-current tree.
>>
>> These seem to be different version of the same change. The version in
>> the net-current tree looks wrong - it contains
>>
>> if (dev->priv_flags&& IFF_802_1Q_VLAN)
>>
>> but it presumably should be
>>
>> if (dev->priv_flags& IFF_802_1Q_VLAN)
>>
>> as in the scsi-rc-fixes version.
>
> I checked the following into my tree so it should all work out.
>
> commit d3af9dd04f8795dc2761ecfa56632e4d0df0dae2
> Author: David S. Miller<davem@davemloft.net>
> Date: Mon Jan 4 14:36:40 2010 -0800
>
> cxgb3i: Fix flags test.
>
> As noticed by Stephen Rothwell.
>
> Signed-off-by: David S. Miller<davem@davemloft.net>
>
> diff --git a/drivers/scsi/cxgb3i/cxgb3i_offload.c b/drivers/scsi/cxgb3i/cxgb3i_offload.c
> index 4b8a513..7449d46 100644
> --- a/drivers/scsi/cxgb3i/cxgb3i_offload.c
> +++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c
> @@ -1442,7 +1442,7 @@ static int is_cxgb3_dev(struct net_device *dev)
> struct cxgb3i_sdev_data *cdata;
> struct net_device *ndev = dev;
>
> - if (dev->priv_flags&& IFF_802_1Q_VLAN)
> + if (dev->priv_flags& IFF_802_1Q_VLAN)
> ndev = vlan_dev_real_dev(dev);
>
> write_lock(&cdata_rwlock);
Hi David,
Sorry for the typo and thanks for fixing it.
Regards
Rakesh Ranjan
prev parent reply other threads:[~2010-01-05 5:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-04 21:56 linux-next: manual merge of the net-current tree with the scsi-rc-fixes tree Stephen Rothwell
2010-01-04 22:37 ` David Miller
2010-01-05 3:41 ` Stephen Rothwell
2010-01-05 5:09 ` Rakesh Ranjan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B42C98B.8070300@chelsio.com \
--to=rakesh@chelsio.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).