On Tue, 4 Jun 2019, Sasha Levin wrote:

Hi,

[This is an automated email]

This commit has been processed because it contains a "Fixes:" tag, fixing commit: 8b00c3d5d40d ncr5380: Implement new eh_abort_handler.

The bot has tested the following trees: v5.1.6, v5.0.20, v4.19.47, v4.14.123, v4.9.180.

v5.1.6: Build OK! v5.0.20: Build OK! v4.19.47: Failed to apply! Possible dependencies: 6a162836997c ("scsi: NCR5380: Reduce goto statements in NCR5380_select()")

v4.14.123: Failed to apply! Possible dependencies: 6a162836997c ("scsi: NCR5380: Reduce goto statements in NCR5380_select()")

v4.9.180: Failed to apply! Possible dependencies: 6a162836997c ("scsi: NCR5380: Reduce goto statements in NCR5380_select()")

How should we proceed with this patch?

Please cherry-pick the dependency, as it does not alter functionality.

$ $ git checkout v4.9 HEAD is now at 69973b830859 Linux 4.9 $ git cherry-pick 6a162836997c [detached HEAD 0e33d17b7b50] scsi: NCR5380: Reduce goto statements in NCR5380_select() Date: Thu Sep 27 11:17:11 2018 +1000 1 file changed, 12 insertions(+), 9 deletions(-) $ git cherry-pick 61f0c0f6aaf8 [detached HEAD 8ae61212c888] scsi: NCR5380: Always re-enable reselection interrupt Date: Mon Mar 25 15:45:51 2019 +1100 1 file changed, 2 insertions(+), 10 deletions(-) $

You could instead apply the patch using more fuzz...

$ $ git checkout v4.9 HEAD is now at 69973b830859 Linux 4.9 $ git show 61f0c0f6aaf8 | patch -p1 -F3 patching file drivers/scsi/NCR5380.c Hunk #1 succeeded at 813 (offset 104 lines). Hunk #2 succeeded at 1210 (offset 98 lines). Hunk #3 succeeded at 1217 with fuzz 3 (offset 98 lines). Hunk #4 succeeded at 1251 (offset 95 lines). Hunk #5 succeeded at 1901 (offset 77 lines). Hunk #6 succeeded at 1932 (offset 77 lines). Hunk #7 succeeded at 2039 (offset 82 lines). $

This also works but would seem to undermine future backporting.

Thanks.