From 9cd7eb224a834dc5e733324f780b0f980894774b Mon Sep 17 00:00:00 2001 From: Artem Savkov Date: Tue, 8 Jan 2019 17:01:42 +0100 Subject: [PATCH] integration/ubuntu1604: temporary disable -SLOW patch kpatch-build currently fails with "invalid ancestor" error. This happens with at least drivers/gpu/drm/i2c/adv7511.o and drivers/hwmon/htu21.o files. The problem is their .ko counterparts are never built for some reason, This looks like a kernel bug since in both cases there are files with same name but in different paths that have .ko module built. Signed-off-by: Artem Savkov --- ...t => meminfo-cmdline-rebuild-SLOW-LOADED.test.disabled} | 0 ...W.patch => meminfo-cmdline-rebuild-SLOW.patch.disabled} | 7 +++++++ 2 files changed, 7 insertions(+) rename test/integration/ubuntu-16.04/{meminfo-cmdline-rebuild-SLOW-LOADED.test => meminfo-cmdline-rebuild-SLOW-LOADED.test.disabled} (100%) rename test/integration/ubuntu-16.04/{meminfo-cmdline-rebuild-SLOW.patch => meminfo-cmdline-rebuild-SLOW.patch.disabled} (76%) diff --git a/test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW-LOADED.test b/test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW-LOADED.test.disabled similarity index 100% rename from test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW-LOADED.test rename to test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW-LOADED.test.disabled diff --git a/test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW.patch b/test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW.patch.disabled similarity index 76% rename from test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW.patch rename to test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW.patch.disabled index 4fcf74c..664b9b3 100644 --- a/test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW.patch +++ b/test/integration/ubuntu-16.04/meminfo-cmdline-rebuild-SLOW.patch.disabled @@ -1,3 +1,10 @@ +Disabled: +kpatch-build currently fails with "invalid ancestor" error. This happens +with at least drivers/gpu/drm/i2c/adv7511.o and drivers/hwmon/htu21.o +files. The problem is their .ko counterparts are never built for some +reason, This looks like a kernel bug since in both cases there are files +with same name but in different paths that have .ko module built. +--- diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c --- src.orig/fs/proc/cmdline.c 2016-12-15 19:55:39.084000000 +0000 +++ src/fs/proc/cmdline.c 2016-12-15 19:57:13.988000000 +0000