From: Bart Van Assche <bvanassche@acm•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
"Martin K. Petersen" <martin.petersen@oracle•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro•org>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Date: Fri, 21 Mar 2025 09:29:20 -0700 [thread overview]
Message-ID: <6e024a8c-5d54-44dd-8ab9-cb1d269c288a@acm.org> (raw)
In-Reply-To: <20250321164700.477efe5c@canb.auug.org.au>
On 3/20/25 10:47 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/ufs/core/ufshcd.c
>
> between commit:
>
> fe06b7c07f3f ("scsi: ufs: core: Set default runtime/system PM levels before ufshcd_hba_init()")
>
> from Linus' tree and commit:
>
> 20b97acc4caf ("scsi: ufs: core: Fix a race condition related to device commands")
>
> 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.
Hi Stephen,
Thank you for having resolved this conflict. While the conflict
resolution looks good to me and should result in working code, it may
be desirable to resolve it differently (init_completion() before the
ufs_get_desired_pm_lvl_for_dev_link_state() calls). This way the
spin_lock_init() and init_completion() calls stay close to each other.
Thanks,
Bart.
next prev parent reply other threads:[~2025-03-21 16:29 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-21 5:47 linux-next: manual merge of the scsi-mkp tree with Linus' tree Stephen Rothwell
2025-03-21 16:29 ` Bart Van Assche [this message]
2025-03-23 20:23 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-11-14 3:36 Stephen Rothwell
2025-11-14 16:31 ` Bart Van Assche
2024-10-28 7:05 Stephen Rothwell
2024-07-09 6:57 Stephen Rothwell
2024-07-11 2:26 ` Martin K. Petersen
2023-08-28 3:02 Stephen Rothwell
2023-09-01 0:23 ` Karan Tilak Kumar (kartilak)
2023-03-20 1:16 Stephen Rothwell
2022-02-14 3:29 Stephen Rothwell
2022-02-14 8:57 ` John Garry
2021-12-08 3:32 Stephen Rothwell
2021-10-06 4:44 Stephen Rothwell
2021-08-11 5:40 Stephen Rothwell
2021-08-11 5:53 ` Sreekanth Reddy
2021-08-12 3:25 ` Martin K. Petersen
2020-09-03 5:21 Stephen Rothwell
2020-09-02 5:15 Stephen Rothwell
2020-09-02 5:12 Stephen Rothwell
2020-09-11 4:47 ` Stephen Rothwell
2020-06-10 2:17 Stephen Rothwell
2020-06-11 2:12 ` Stephen Rothwell
2019-02-11 4:31 Stephen Rothwell
2019-02-11 9:24 ` John Garry
2019-02-07 4:44 Stephen Rothwell
2019-02-07 18:30 ` James Smart
2018-12-10 6:17 Stephen Rothwell
2018-12-10 7:09 ` Stephen Rothwell
2018-10-18 4:15 Stephen Rothwell
2018-08-03 6:22 Stephen Rothwell
2018-08-03 6:04 Stephen Rothwell
2018-07-11 4:04 Stephen Rothwell
2018-07-12 4:29 ` Stephen Rothwell
2018-03-22 5:54 Stephen Rothwell
2017-11-30 1:51 Stephen Rothwell
2017-11-30 1:55 ` Stephen Rothwell
2017-12-01 2:14 ` Martin K. Petersen
2017-12-01 3:42 ` Stephen Rothwell
2017-09-01 4:48 Stephen Rothwell
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=6e024a8c-5d54-44dd-8ab9-cb1d269c288a@acm.org \
--to=bvanassche@acm$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=manivannan.sadhasivam@linaro$(echo .)org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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