linux-kernel - RE: linux-next: manual merge of the scsi-mkp tree with Linus' tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <SJ0PR11MB58964806CF716BB19A8F1DD3C3E4A@SJ0PR11MB5896.namprd11.prod.outlook.com>
Date:   Fri, 1 Sep 2023 00:23:31 +0000
From:   "Karan Tilak Kumar (kartilak)" <kartilak@...co.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
CC:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: RE: linux-next: manual merge of the scsi-mkp tree with Linus' tree

Hi Stephen,

Thanks for your help on this.

I cloned this repo, and checked out the master branch:

git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
git checkout master

I don't see these two commits there yet.

Are these commits scheduled to be merged sometime soon?
Please advise.

Thanks,
Karan

-----Original Message-----
From: Stephen Rothwell <sfr@...b.auug.org.au> 
Sent: Sunday, August 27, 2023 8:03 PM
To: Martin K. Petersen <martin.petersen@...cle.com>
Cc: Karan Tilak Kumar (kartilak) <kartilak@...co.com>; Linux Kernel Mailing List <linux-kernel@...r.kernel.org>; Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the scsi-mkp tree with Linus' tree

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/fnic/fnic.h

between commit:

  5a43b07a8783 ("scsi: fnic: Replace return codes in fnic_clean_pending_aborts()")

from Linus' tree and commit:

  15924b050363 ("scsi: fnic: Replace sgreset tag with max_tag_id")

from the scsi-mkp tree.

I fixed it up (it was just the version number, so I used the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell