* linux-next: manual merge of the scsi-mkp tree with the mm tree
@ 2023-09-06 0:39 Stephen Rothwell
2023-09-14 23:19 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-09-06 0:39 UTC (permalink / raw)
To: Martin K. Petersen, Andrew Morton
Cc: Jinjie Ruan, Linux Kernel Mailing List, Linux Next Mailing List,
Luo Jiaxing, Xingui Yang
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
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;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the scsi-mkp tree with the mm tree
2023-09-06 0:39 linux-next: manual merge of the scsi-mkp tree with the mm tree Stephen Rothwell
@ 2023-09-14 23:19 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2023-09-14 23:19 UTC (permalink / raw)
To: Martin K. Petersen, Andrew Morton
Cc: Jinjie Ruan, Linux Kernel Mailing List, Linux Next Mailing List,
Luo Jiaxing, Xingui Yang
[-- Attachment #1: Type: text/plain, Size: 1750 bytes --]
Hi all,
On Wed, 6 Sep 2023 10:39:05 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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")
now
edcac2e0d679 ("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;
This is now a conflict between the mm tree and the scsi-fixes tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-14 23:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-06 0:39 linux-next: manual merge of the scsi-mkp tree with the mm tree Stephen Rothwell
2023-09-14 23:19 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox