On Tuesday, December 5, 2023 7:11 PM, Martin K. Petersen <martin.petersen@oracle.com> wrote:
>
>
> Karan,
>
> > This cover letter describes the feature: add support for multiqueue
> > (MQ) to fnic driver.
>
> This series doesn't apply to 6.8/scsi-queue.

Okay. Thanks Martin.
Please advise how I can proceed with getting the patch set accepted.

> Also, for change entries for individual patches, please make sure you put them after a "---" separator so they don't end up in the commit history.
>
> Thanks!
>
> --

Thanks Martin.

I'll modify the commit entries in the individual patches in the patch set and re-submit the patch set.
Just to make sure I understand this correctly, this is what I will do for the individual patches in the entire patch set:

  1 From 818867e64180c2456d3f33761cb7fb6e00679849 Mon Sep 17 00:00:00 2001
  2 From: Karan Tilak Kumar <kartilak@cisco.com>
  3 Date: Fri, 13 Oct 2023 13:38:09 -0700
  4 Subject: [PATCH v4 02/13] scsi: fnic: Add and use fnic number
  5
  6 Add fnic_num in fnic.h to identify fnic in a multi-fnic environment.
  7 Increment and set the fnic number during driver load in fnic_probe.
  8 Replace the host number with fnic number in debugfs.
  9
 10 Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com>
 11 Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com>
 12 Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
 13 ---								-> Introduce a separator between the commit and the change entries
 14 Changes between v3 and v4:
 15     Incorporate review comments from Martin and Hannes:
 16     Undo the change to replace host number with fnic
 17     number in debugfs since kernel stack uses host number.
 18     Use ida_alloc to allocate ID for fnic number.

Please let me know if I've missed anything.

Regards,
Karan

Hi Karan!

>> This series doesn't apply to 6.8/scsi-queue.
>
> Okay. Thanks Martin.
> Please advise how I can proceed with getting the patch set accepted.

I tried v5 and it fails the same way as v4. First failure is patch #9,
several additional conflicts after that.

You need to submit a patch series that has been rebased on top of my
6.8/scsi-queue branch. I don't know what you used as baseline for the
series in your git tree but it is not a suitable ancestor of my tree.

Your changelog modification is fine. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

On Friday, December 8, 2023 10:04 AM, Martin K. Petersen <martin.petersen@oracle.com> wrote:
>
>
> Hi Karan!
>
> >> This series doesn't apply to 6.8/scsi-queue.
> >
> > Okay. Thanks Martin.
> > Please advise how I can proceed with getting the patch set accepted.
>
> I tried v5 and it fails the same way as v4. First failure is patch #9, several additional conflicts after that.
>
> You need to submit a patch series that has been rebased on top of my 6.8/scsi-queue branch. I don't know what you used as baseline for the series in your git tree but it is not a suitable ancestor of my tree.
>
> Your changelog modification is fine. Thanks!
>
> --
> Martin K. Petersen    Oracle Linux Engineering
>

Thanks for this crucial piece of information, Martin.

I'll rebase the changes on top of the mentioned branch and re-submit the patch set.

Regards,
Karan