From: Vipul Pandya <vipul@chelsio•com>
To: David Miller <davem@davemloft•net>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>,
Divy Le Ray <divy@chelsio•com>,
Dimitrios Michailidis <dm@chelsio•com>,
Abhishek Agrawal <abhishek@chelsio•com>,
Santosh Rastapur <santosh@chelsio•com>
Subject: Re: [PATCH net-next] cxgb4: Allow for backward compatibility with new VPD scheme.
Date: Mon, 11 Mar 2013 17:19:07 +0530 [thread overview]
Message-ID: <513DC4B3.3050905@chelsio.com> (raw)
In-Reply-To: <20130311.074136.1262065455365949917.davem@davemloft.net>
On 11-03-2013 17:11, David Miller wrote:
> From: Vipul Pandya <vipul@chelsio•com>
> Date: Mon, 11 Mar 2013 12:23:12 +0530
>
>>
>>
>> On 11-03-2013 12:00, David Miller wrote:
>>> From: Vipul Pandya <vipul@chelsio•com>
>>> Date: Mon, 11 Mar 2013 11:21:51 +0530
>>>
>>>>
>>>>
>>>> On 08-03-2013 23:14, David Miller wrote:
>>>>> From: Vipul Pandya <vipul@chelsio•com>
>>>>> Date: Fri, 8 Mar 2013 19:05:29 +0530
>>>>>
>>>>>> From: Santosh Rastapur <santosh@chelsio•com>
>>>>>>
>>>>>> New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset
>>>>>> 0x400 of the function. If no 3rd party VPD is present, then a copy of
>>>>>> Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which
>>>>>> requires the VPD to be present at offset 0x0.
>>>>>>
>>>>>> Signed-off-by: Santosh Rastapur <santosh@chelsio•com>
>>>>>> Signed-off-by: Vipul Pandya <vipul@chelsio•com>
>>>>>
>>>>> Isn't this a fix which is better targetted at 'net' than 'net-next'?
>>>>>
>>>>
>>>> We have very soon new patch series coming up for net-next. This patch
>>>> requires for that patch series to work correctly. So, we would like to
>>>> get this merge in net-next tree.
>>>
>>> But you can achieve that by asking me to apply this to 'net' and then
>>> when the patch series that depends upon it is posted, you tell me about
>>> this dependency.
>>>
>> Ok. I was not aware of this. However there can be a merge conflict at
>> the time of merging 'net' and 'net-next' tree if this patch gets applied
>> in 'net' tree and our new patch series gets applied in 'net-next'. To
>> avoid it we recommended the same. The merge conflict wont be a major and
>> if it is alright to resolve it we can apply this patch to 'net' tree.
>
> That's why you tell me to first pull net into net-next, and you send
> me a patch set for net-next which assumes the fix from 'net' is
> already applied.
>
Ok, I will inform you about the patch dependency on 'net' tree when I
post the patch series targeted for 'net-next'. Please consider applying
this patch to net tree.
Thanks,
Vipul
next prev parent reply other threads:[~2013-03-11 11:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-08 13:35 [PATCH net-next] cxgb4: Allow for backward compatibility with new VPD scheme Vipul Pandya
2013-03-08 17:44 ` David Miller
2013-03-11 5:51 ` Vipul Pandya
2013-03-11 6:30 ` David Miller
2013-03-11 6:53 ` Vipul Pandya
2013-03-11 11:41 ` David Miller
2013-03-11 11:49 ` Vipul Pandya [this message]
2013-03-12 9:37 ` David Miller
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=513DC4B3.3050905@chelsio.com \
--to=vipul@chelsio$(echo .)com \
--cc=abhishek@chelsio$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=divy@chelsio$(echo .)com \
--cc=dm@chelsio$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=santosh@chelsio$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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