linux-kernel - linux-next: manual merge of the scsi-mkp tree with the mm 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-next>] [day] [month] [year] [list]

Message-ID: <20230906103905.0752736e@canb.auug.org.au>
Date:   Wed, 6 Sep 2023 10:39:05 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Martin K. Petersen" <martin.petersen@...cle.com>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     Jinjie Ruan <ruanjinjie@...wei.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Luo Jiaxing <luojiaxing@...wei.com>,
        Xingui Yang <yangxingui@...wei.com>
Subject: linux-next: manual merge of the scsi-mkp tree with the mm tree

Hi all,

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

  drivers/scsi/qla2xxx/qla_dfs.c

between commit:

  d16e04dc79ed ("scsi: qla2xxx: use DEFINE_SHOW_STORE_ATTRIBUTE() helper for debugfs")

from the mm tree and commit:

  d0b0822e32db ("scsi: qla2xxx: Fix NULL vs IS_ERR() bug for debugfs_create_dir()")

from the scsi-mkp tree.

I fixed it up (see below) 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

diff --cc drivers/scsi/qla2xxx/qla_dfs.c
index debb14d71e8a,a7a364760b80..000000000000
--- a/drivers/scsi/qla2xxx/qla_dfs.c
+++ b/drivers/scsi/qla2xxx/qla_dfs.c
@@@ -662,8 -707,8 +662,8 @@@ create_nodes
  
  	if (IS_QLA27XX(ha) || IS_QLA83XX(ha) || IS_QLA28XX(ha)) {
  		ha->tgt.dfs_naqp = debugfs_create_file("naqp",
 -		    0400, ha->dfs_dir, vha, &dfs_naqp_ops);
 +		    0400, ha->dfs_dir, vha, &qla_dfs_naqp_fops);
- 		if (!ha->tgt.dfs_naqp) {
+ 		if (IS_ERR(ha->tgt.dfs_naqp)) {
  			ql_log(ql_log_warn, vha, 0xd011,
  			       "Unable to create debugFS naqp node.\n");
  			goto out;

Content of type "application/pgp-signature" skipped