From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle•com>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Jinjie Ruan <ruanjinjie@huawei•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Luo Jiaxing <luojiaxing@huawei•com>,
Xingui Yang <yangxingui@huawei•com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the mm tree
Date: Fri, 15 Sep 2023 09:19:31 +1000 [thread overview]
Message-ID: <20230915091931.62f860f9@canb.auug.org.au> (raw)
In-Reply-To: <20230906103905.0752736e@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2023-09-14 23:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230915091931.62f860f9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=luojiaxing@huawei$(echo .)com \
--cc=martin.petersen@oracle$(echo .)com \
--cc=ruanjinjie@huawei$(echo .)com \
--cc=yangxingui@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox