Changes in settings

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/tools/testing/selftests/livepatch/settings

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/tools/testing/selftests/livepatch/settings

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 02:42:33 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.6 merge window. List of files: /linux/tools/testing/selftests/livepatch/settings

1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c - Merge tag 'v5.5-rc5' into next

Fri, 10 Jan 2020 23:56:04 +0100

Merge tag 'v5.5-rc5' into nextSync up with mainline to get SPI "delay" API changes. List of files: /linux/tools/testing/selftests/livepatch/settings

22164fbe274c2dd96d2887fe121896d321000a61 - Merge drm/drm-next into drm-misc-next

Mon, 06 Jan 2020 10:35:33 +0100

Merge drm/drm-next into drm-misc-nextRequested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.Signed-off-by: Maarten Lankhorst List of files: /linux/tools/testing/selftests/livepatch/settings

023265ed75d8792ca1d555430a8985511d3f8788 - Merge drm/drm-next into drm-intel-next-queued

Wed, 11 Dec 2019 09:35:37 +0100

Merge drm/drm-next into drm-intel-next-queuedSync up with v5.5-rc1 to get the updated lock_release() API among otherthings. Fix the conflict reported by Stephen Rothwell [1].[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.auSigned-off-by: Jani Nikula List of files: /linux/tools/testing/selftests/livepatch/settings

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 22:16:58 +0100

Merge mainline/master into arm/fixesThis brings in the mainline tree right after armsoc contents was mergedthis release cycle, so that we can re-run savedefconfig, etc.Signed-off-by: Olof Johansson List of files: /linux/tools/testing/selftests/livepatch/settings

2ea352d5960ad469f5712cf3e293db97beac4e01 - Merge remote-tracking branch 'torvalds/master' into perf/core

Tue, 26 Nov 2019 15:06:19 +0100

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up BPF changes we'll need.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/tools/testing/selftests/livepatch/settings

f838767555d40f29bc4771c5c8cc63193094b7cc - Merge tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Tue, 26 Nov 2019 04:43:48 +0100

Merge tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatchingPull livepatching updates from Petr Mladek: - New API to track system state changes done be livepatch callbacks. It helps to maintain compatibility between livepatches. - Update Kconfig help text. ORC is another reliable unwinder. - Disable generic selftest timeout. Livepatch selftests have their own per-operation fine-grained timeouts.* tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: x86/stacktrace: update kconfig help text for reliable unwinders livepatch: Selftests of the API for tracking system state changes livepatch: Documentation of the new API for tracking system state changes livepatch: Allow to distinguish different version of system state changes livepatch: Basic API to track system state changes livepatch: Keep replaced patches until post_patch callback is called selftests/livepatch: Disable the timeout List of files: /linux/tools/testing/selftests/livepatch/settings

d891433b8d554731e1d54c4ed04045479e1cff37 - Merge branch 'for-5.5/selftests' into for-linus

Mon, 25 Nov 2019 13:53:15 +0100

Merge branch 'for-5.5/selftests' into for-linus List of files: /linux/tools/testing/selftests/livepatch/settings

29d968e13007e067b35d41a047e2a4573a017194 - selftests/livepatch: Disable the timeout

Fri, 25 Oct 2019 13:50:41 +0200

selftests/livepatch: Disable the timeoutCommit 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 secondtimeout per test") introduced a timeout per test. Livepatch tests couldrun longer than 45 seconds, especially on slower machines. They do nothang and they detect if something goes awry with internal accounting.Better than looking for an arbitrary value, just disable the timeout forlivepatch selftests.Signed-off-by: Miroslav Benes Reviewed-by: Joe Lawrence Signed-off-by: Jiri Kosina List of files: /linux/tools/testing/selftests/livepatch/settings