Changes in settings

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/tools/testing/selftests/tpm2/settings

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/tools/testing/selftests/tpm2/settings

5f8f8574c7f5585b09a9623f0f13462e4eb67b4d - Merge branch 'next' into for-linus

Mon, 10 Oct 2022 07:30:23 +0200

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

97acb6a8fcc4e5c2cdc2693a35acdc5a7461aaa3 - Merge drm/drm-next into drm-intel-gt-next

Mon, 03 Oct 2022 18:04:02 +0200

Merge drm/drm-next into drm-intel-gt-nextDaniele needs 84d4333c1e28 ("misc/mei: Add NULL check to component matchcallback functions") in order to merge the DG2 HuC patches.Signed-off-by: Tvrtko Ursulin List of files: /linux/tools/testing/selftests/tpm2/settings

305a72efa791c826fe84768ca55e31adc4113ea8 - Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next

Sun, 02 Oct 2022 04:16:16 +0200

Merge branch 'for-6.1/nvdimm' into libnvdimm-for-nextAdd v6.1 content on top of some straggling updates that missed v6.0. List of files: /linux/tools/testing/selftests/tpm2/settings

70d1b1a7f8b32b78c09b30dbcfa25ba1e470568b - Merge branch 'mlx5-vfio' into mlx5-next

Tue, 27 Sep 2022 11:56:24 +0200

Merge branch 'mlx5-vfio' into mlx5-nextMerge net/mlx5 dependencies for device DMA logging.Signed-off-by: Leon Romanovsky List of files: /linux/tools/testing/selftests/tpm2/settings

b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 - Merge branch 'for-6.0/dax' into libnvdimm-fixes

Sun, 25 Sep 2022 03:14:12 +0200

Merge branch 'for-6.0/dax' into libnvdimm-fixesPick up another "Soft Reservation" fix for v6.0-final on top of somestraggling nvdimm fixes that missed v5.19. List of files: /linux/tools/testing/selftests/tpm2/settings

74656d03ac36fabb16b9df5221cf398ee3a9ca08 - Merge tag 'v6.0-rc6' into locking/core, to refresh the branch

Wed, 21 Sep 2022 09:58:02 +0200

Merge tag 'v6.0-rc6' into locking/core, to refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/tools/testing/selftests/tpm2/settings

a108772d03d8bdb43258218b00bfe43bbe1e8800 - Merge drm/drm-next into drm-misc-next

Wed, 14 Sep 2022 13:22:18 +0200

Merge drm/drm-next into drm-misc-nextWe need 6.0-rc1 to merge the backlight rework PR.Signed-off-by: Maxime Ripard List of files: /linux/tools/testing/selftests/tpm2/settings

2a906db2824b75444982f5e9df870106982afca8 - Merge branch 'am5748-fix' into fixes

Tue, 06 Sep 2022 08:45:27 +0200

Merge branch 'am5748-fix' into fixes List of files: /linux/tools/testing/selftests/tpm2/settings

1043897681808118c0f7e70b210774000fe06621 - Merge branch 'linus' into x86/mm, to refresh the branch

Fri, 02 Sep 2022 10:31:58 +0200

Merge branch 'linus' into x86/mm, to refresh the branchThis branch is ~14k commits behind upstream, and has an old merge basefrom early into the merge window, refresh it to v6.0-rc3+fixes beforequeueing up new commits.Signed-off-by: Ingo Molnar List of files: /linux/tools/testing/selftests/tpm2/settings

53aa930dc4bae6aa269951bd37103083145d6691 - Merge branch 'sched/warnings' into sched/core, to pick up WARN_ON_ONCE() conversion commit

Tue, 30 Aug 2022 10:27:33 +0200

Merge branch 'sched/warnings' into sched/core, to pick up WARN_ON_ONCE() conversion commitMerge in the BUG_ON() => WARN_ON_ONCE() conversion commit.Signed-off-by: Ingo Molnar List of files: /linux/tools/testing/selftests/tpm2/settings

917bda9ab155032a02be1a57ebd4d949ae9e1528 - Merge drm/drm-next into drm-intel-next

Mon, 29 Aug 2022 13:44:38 +0200

Merge drm/drm-next into drm-intel-nextSync drm-intel-next with v6.0-rc as well as recent drm-intel-gt-next.Since drm-next does not have commit f0c70d41e4e8 ("drm/i915/guc: removeruntime info printing from time stamp logging") yet, onlydrm-intel-gt-next, will need to do that as part of the merge here tobuild.Signed-off-by: Jani Nikula List of files: /linux/tools/testing/selftests/tpm2/settings

93fbff1197474d7b65e598c6f48fa82a5c334539 - Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into next

Wed, 17 Aug 2022 21:30:00 +0200

Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into nextSync up with the latest I2C code base to get updated prototype of I2Cbus remove() method. List of files: /linux/tools/testing/selftests/tpm2/settings

cf36ae3e5802716617b9e4d902a31048240396b0 - Merge drm/drm-fixes into drm-misc-fixes

Wed, 17 Aug 2022 08:40:32 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging for v6.0-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/tools/testing/selftests/tpm2/settings

e05d5b9c5bbea80313d8f58c3a80a18839b25480 - Merge tag 'linux-kselftest-next-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Wed, 03 Aug 2022 04:44:56 +0200

Merge tag 'linux-kselftest-next-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftestPull Kselftest updates from Shuah Khan: - timers test build fixes and cleanups for new tool chains - removing khdr from kselftest framework and main Makefile - changes to test output messages to improve reports* tag 'linux-kselftest-next-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (24 commits) Makefile: replace headers_install with headers for kselftest selftests/landlock: drop deprecated headers dependency selftests: timers: clocksource-switch: adapt to kselftest framework selftests: timers: clocksource-switch: add 'runtime' command line parameter selftests: timers: clocksource-switch: add command line switch to skip sanity check selftests: timers: clocksource-switch: sort includes selftests: timers: clocksource-switch: fix passing errors from child selftests: timers: inconsistency-check: adapt to kselftest framework selftests: timers: nanosleep: adapt to kselftest framework selftests: timers: fix declarations of main() selftests: timers: valid-adjtimex: build fix for newer toolchains Makefile: add headers_install to kselftest targets selftests: drop KSFT_KHDR_INSTALL make target selftests: stop using KSFT_KHDR_INSTALL selftests: drop khdr make target selftests: drivers/dma-buf: Improve message in selftest summary selftests/kcmp: Make the test output consistent and clear selftests:timers: globals don't need initialization to 0 selftests/drivers/gpu: Add error messages to drm_mm.sh selftests/tpm2: increase timeout for kselftests ... List of files: /linux/tools/testing/selftests/tpm2/settings

6b56f5f1ef93ec1b34dee1ef72da33ec046f82be - selftests/tpm2: increase timeout for kselftests

Tue, 28 Jun 2022 16:39:27 +0200

selftests/tpm2: increase timeout for kselftestsDue to CreatePrimary commands which need to create RSA keys ofincreasing size, the timeout value need to be raised, as well.Default is 45s.Fixed git am white space warns:Shuah Khan Signed-off-by: Johannes Holland Signed-off-by: Stefan Mahnke-Hartmann Signed-off-by: Shuah Khan List of files: /linux/tools/testing/selftests/tpm2/settings