On Mon, Mar 23, 2020 at 6:41 AM Vignesh Gunasekaran <[email protected]> wrote: > > >So I appreciate the patch set you've provided, but due to the number of > >patches, what I need to do is >cherry-pick them from mainline and push a > >branch with cherry picks rather than 70+ patches that need to be > >>reviewed/applied by the kernel team. > > > >And because I can't find these in mainline at all (I've just checked all the > >proposed commit ids against the >most recent updates to mainline) I can't > >cherry pick these. Do you know when they'll be accepted upstream? > > > >I also checked against Linus tree and cant find those commit IDs there > >either. > > Jeff, > > All of those 72 patches are already accepted by the Kernel community and > most of them are already pulled into linus.git except for the ones you > listed. But, the ones you have listed are present in mkp/scsi.git.
So as I mentioned in my reply to Laurie just now, I've built some kernels freshly over the weekend and uploaded them. However, I do have to tell you that I'm pretty sure they won't accept packages from mkp/scsi.git, the general rule of thumb is that they're only accepted into the Ubuntu kernel once they're accepted into the Mainline kernel. However, I'll submit them anyway and see what happens. I still am not sure if they'll accept at all given that several do touch common code rather than being driver specific, but we'll see how everything lands. > > Even when I was creating a patchset I went by searching those commit > IDs, but couldn't find them either in linus.git or mkp/scsi.git. I guess > those commit IDs were from local git. So, I found the equivalent commit > IDs for those patches in mkp/scsi.git and cherry-picked them. > > Ultimately, all 72 patches are already cherry-picked from either > linus.git or mkp/scsi.git. The patchset has the cherry-pick reference in > it. > > > I verified the patchset applies cleanly on the focal tree using: > > #git am /<patches_directory>/*.patch > > I thought executing this command is all you have to do it from your end. I needed to cherry pick each (or at least I was able to add what I needed via 'git am') and add a signed-off line with my name and add a bug link to the commit message for each patch. The tree I built just now has all that, so it's good now. > Regarding comment 6: > > >Additionally, this one does not cleanly apply when cherry-picked: > >765ab6cdac3b681952da0e22184bf6cf1ae41cf8 scsi: lpfc: Fix a kernel > >warning triggered by lpfc_get_sgl_per_hdwq() > > This commit is already pulled into the focal tree from upstream. Weird, I tried searching out tree for both that commit ID and by text searching the subject and didn't find it... oh well, I've limited the test kernels to just the 72 patches you provided in your tarball. Thanks for that tarball and sorry for any confusion on my end (this isn't something I routinely do, so I'm a bit cobwebby when I have to do these). -- Jeff Lane Engineering Manager IHV/OEM Alliances and Server Certification "Entropy isn't what it used to be." -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1855303 Title: Update Broadcom Emulex lpfc driver in 5.4 to 12.6.0.x from 5.5 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1855303/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
