From: Bart Van Assche <bvanassche@acm.org>
To: Pavel Machek <pavel@denx.de>
Cc: Jens Axboe <axboe@kernel.dk>,
jejb@linux.ibm.com, martin.petersen@oracle.com, lduncan@suse.com,
hare@suse.com, mcgrof@kernel.org, jthumshirn@suse.de, hch@lst.de,
gregkh@linuxfoundation.org, dan.j.williams@intel.com,
kernel list <linux-kernel@vger.kernel.org>,
rjw@rjwysocki.net, linux-pm@vger.kernel.org,
sfr@canb.auug.org.au, linux-next@vger.kernel.org,
hdegoede@redhat.com, linux-ide@vger.kernel.org
Subject: Re: regression -next -- scsi: sd: Rely on the driver core for asynchronous probing was Re: next-20190408..0418: Suspend/resume problems on Thinkpad X60
Date: Thu, 25 Apr 2019 06:35:58 -0700 [thread overview]
Message-ID: <360f6936-ee21-a036-9bd4-93ecfee829e2@acm.org> (raw)
In-Reply-To: <20190425073343.GA19600@amd>
On 4/25/19 12:33 AM, Pavel Machek wrote:
> On Wed 2019-04-24 13:56:01, Bart Van Assche wrote:
>> On Wed, 2019-04-24 at 22:51 +0200, Pavel Machek wrote:
>>> Unfortunately, that one does not revert cleanly on top of -next.
>>
>> Can you try the following:
>>
>> git revert d16ece577bf2cee7f94bab75a0d967bcb89dd2a7 &&
>> git revert 21e6ba3f0e0257cce1a226c1f15e0a8ba4338ca3
>>
>> I will see whether I can come up with a better way to analyze what is
>> going on. I had not expected that these patches would cause any suspend/
>> resume problems.
>
> Not even d16ece reverts:
>
> pavel@duo:/data/l/linux-next-32$ git show | head -3
> commit 76c938fcaa4b4a5d8f05fa907925d5043834964e
> Author: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue Apr 23 20:24:59 2019 +1000
> pavel@duo:/data/l/linux-next-32$ git revert
> d16ece577bf2cee7f94bab75a0d967bcb89dd2a7
> error: could not revert d16ece5... scsi: sd: Inline sd_probe_part2()
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'
There has been a non-trivial merge between the block and scsi trees in
linux-next. That's probably what prevents these patches to revert
cleanly. How about performing the following tests:
* Build, boot and test Martin's latest for-5.2 branch
(git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git; branch
5.2/scsi-queue).
* If suspend/resume does not work reliably with that branch, revert the
two patches above, rebuild, reboot and retest.
Thanks,
Bart.
next prev parent reply other threads:[~2019-04-25 13:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190408173928.GB13260@amd>
2019-04-12 10:28 ` next-20190408: Suspend/resume problems on Thinkpad X60 Pavel Machek
2019-04-23 10:22 ` next-20190408..0418: " Pavel Machek
2019-04-23 13:55 ` Jens Axboe
2019-04-24 8:26 ` Pavel Machek
2019-04-24 9:54 ` Pavel Machek
2019-04-24 10:48 ` Pavel Machek
2019-04-24 20:21 ` Pavel Machek
2019-04-24 20:48 ` regression -next -- scsi: sd: Rely on the driver core for asynchronous probing was " Pavel Machek
2019-04-24 20:51 ` Pavel Machek
2019-04-24 20:56 ` Bart Van Assche
2019-04-25 7:33 ` Pavel Machek
2019-04-25 13:35 ` Bart Van Assche [this message]
2019-04-26 10:32 ` Pavel Machek
2019-04-26 14:58 ` Bart Van Assche
2019-04-26 17:59 ` Pavel Machek
2019-04-23 14:09 ` Bart Van Assche
2019-04-24 10:17 ` Pavel Machek
2019-04-24 22:34 ` Bart Van Assche
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=360f6936-ee21-a036-9bd4-93ecfee829e2@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=dan.j.williams@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=hdegoede@redhat.com \
--cc=jejb@linux.ibm.com \
--cc=jthumshirn@suse.de \
--cc=lduncan@suse.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mcgrof@kernel.org \
--cc=pavel@denx.de \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).