Merge ~canonical-kernel-team/+git/autotest-client-tests:magalilemes/fix-2017028 into ~canonical-kernel-team/+git/autotest-client-tests:master

[Magali Lemes do Sacramento]

Only run ubuntu_btrfs_kernel_fixes ff76b0565523319d7c1c0b51d5a5a8915d33efab test when the kernel version is < 5.11.

[Po-Hsu Lin (cypressyew)]

Make sense, this was introduced before we have 5.15 (5.14 and 5.17 available as OEM kernels first).
Since we don't have those kernels anymore, +1 to change this limit.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

diff --git a/ubuntu_btrfs_kernel_fixes/control b/ubuntu_btrfs_kernel_fixes/control
index 985ad49..c1109ee 100644
--- a/ubuntu_btrfs_kernel_fixes/control
+++ b/ubuntu_btrfs_kernel_fixes/control
@@ -75,9 +75,8 @@ elif kernel >= 419:
         '2365dd3ca02bbb6d3412404482e1d85752549953.sh',
     ]
 
-if kernel >= 517:
+if kernel >= 511:
     # 'inode_cache' option is deprecated and has no effect since 5.11
-    # But OEM-5.14 can pass with it, so just blacklist it with >= 5.17
     blacklist.append('ff76b0565523319d7c1c0b51d5a5a8915d33efab.sh')
 
 if release == '14.04':