lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 11 Mar 2013 17:19:07 +0530 From: Vipul Pandya <vipul@...lsio.com> To: David Miller <davem@...emloft.net> CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>, Divy Le Ray <divy@...lsio.com>, Dimitrios Michailidis <dm@...lsio.com>, Abhishek Agrawal <abhishek@...lsio.com>, Santosh Rastapur <santosh@...lsio.com> Subject: Re: [PATCH net-next] cxgb4: Allow for backward compatibility with new VPD scheme. On 11-03-2013 17:11, David Miller wrote: > From: Vipul Pandya <vipul@...lsio.com> > Date: Mon, 11 Mar 2013 12:23:12 +0530 > >> >> >> On 11-03-2013 12:00, David Miller wrote: >>> From: Vipul Pandya <vipul@...lsio.com> >>> Date: Mon, 11 Mar 2013 11:21:51 +0530 >>> >>>> >>>> >>>> On 08-03-2013 23:14, David Miller wrote: >>>>> From: Vipul Pandya <vipul@...lsio.com> >>>>> Date: Fri, 8 Mar 2013 19:05:29 +0530 >>>>> >>>>>> From: Santosh Rastapur <santosh@...lsio.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@...lsio.com> >>>>>> Signed-off-by: Vipul Pandya <vipul@...lsio.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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists