Changes in .gitignore

1260ed77798502de9c98020040d2995008de10cc - Merge drm/drm-fixes into drm-misc-fixes

Tue, 08 Apr 2025 10:15:47 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get updates from v6.15-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/tools/testing/selftests/zram/.gitignore

946661e3bef8efa11ba8079d4ebafe6fc3b0aaad - Merge branch 'next' into for-linus

Sat, 05 Apr 2025 08:04:35 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.15 merge window. List of files: /linux/tools/testing/selftests/zram/.gitignore

0b119045b79a672bc6d8f18641c60fc8ce1b4585 - Merge tag 'v6.14-rc4' into next

Wed, 26 Feb 2025 01:03:25 +0100

Merge tag 'v6.14-rc4' into nextSync up with the mainline. List of files: /linux/tools/testing/selftests/zram/.gitignore

9e676a024fa1fa2bd8150c2d2ba85478280353bc - Merge tag 'v6.14-rc1' into perf-tools-next

Wed, 05 Feb 2025 23:57:18 +0100

Merge tag 'v6.14-rc1' into perf-tools-nextTo get the various fixes in the current master.Signed-off-by: Namhyung Kim List of files: /linux/tools/testing/selftests/zram/.gitignore

0410c6121529409b08e81a77ae3ee58c657e2243 - Merge drm/drm-next into drm-xe-next

Fri, 28 Feb 2025 15:54:14 +0100

Merge drm/drm-next into drm-xe-nextSync to fix conlicts between drm-xe-next and drm-intel-next.Signed-off-by: Lucas De Marchi List of files: /linux/tools/testing/selftests/zram/.gitignore

93c7dd1b39444ebd5a6a98e56a363d7a4e646775 - Merge drm/drm-next into drm-misc-next

Thu, 06 Feb 2025 13:47:32 +0100

Merge drm/drm-next into drm-misc-nextBring rc1 to start the new release dev.Signed-off-by: Maxime Ripard List of files: /linux/tools/testing/selftests/zram/.gitignore

ea9f8f2b21795a5d80418a655bcb212d5b89e08f - Merge drm/drm-next into drm-intel-next

Wed, 05 Feb 2025 18:12:37 +0100

Merge drm/drm-next into drm-intel-nextSync with v6.14-rc1.Signed-off-by: Jani Nikula List of files: /linux/tools/testing/selftests/zram/.gitignore

c771600c6af14749609b49565ffb4cac2959710d - Merge drm/drm-next into drm-intel-gt-next

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/tools/testing/selftests/zram/.gitignore

b3cc7428a32202936904b5b07cf9f135025bafd6 - Merge branch 'for-6.15/amd_sfh' into for-linus

Wed, 26 Mar 2025 13:42:07 +0100

Merge branch 'for-6.15/amd_sfh' into for-linusFrom: Mario Limonciello Some platforms include a human presence detection (HPD) sensor. Whenenabled and a user is detected a wake event will be emitted from thesensor fusion hub that software can react to.Example use cases are "wake from suspend on approach" or to "lockwhen leaving".This is currently enabled by default on supported systems, but userscan't control it. This essentially means that wake on approach isenabled which is a really surprising behavior to users that don'texpect it.Instead of defaulting to enabled add a sysfs knob that users canuse to enable the feature if desirable and set it to disabled bydefault. List of files: /linux/tools/testing/selftests/zram/.gitignore

8fb1e2eed14dc347e1d04b8bf0bf52c606de6da1 - Merge tag 'linux_kselftest-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Wed, 22 Jan 2025 21:30:20 +0100

Merge tag 'linux_kselftest-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftestPull kselftest updates from Shuah Khan: - fixes, reporting improvements, and cleanup changes to several tests - add support for DT_GNU_HASH to selftests/vDSO* tag 'linux_kselftest-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/rseq: Fix handling of glibc without rseq support selftests/resctrl: Discover SNC kernel support and adjust messages selftests/resctrl: Adjust effective L3 cache size with SNC enabled selftests/ftrace: Make uprobe test more robust against binary name selftests/ftrace: Fix to use remount when testing mount GID option selftests: tmpfs: Add kselftest support to tmpfs selftests: tmpfs: Add Test-skip if not run as root selftests: harness: fix printing of mismatch values in __EXPECT() selftests/ring-buffer: Add test for out-of-bound pgoff mapping selftests/run_kselftest.sh: Fix help string for --per-test-log selftests: acct: Add ksft_exit_skip if not running as root selftests: kselftest: Fix the wrong format specifier selftests: timers: clocksource-switch: Adapt progress to kselftest framework selftests/zram: gitignore output file selftests/filesystems: Add missing gitignore file selftests: Warn about skipped tests in result summary selftests: kselftest: Add ksft_test_result_xpass selftests/vDSO: support DT_GNU_HASH selftests/ipc: Remove unused variables selftest: media_tests: fix trivial UAF typo List of files: /linux/tools/testing/selftests/zram/.gitignore

d54d3f69b7a13f193fd537c60b0184aefc35bc24 - selftests/zram: gitignore output file

Wed, 11 Dec 2024 01:46:25 +0100

selftests/zram: gitignore output fileAfter `make run_tests`, the git status complains:Untracked files: (use "git add ..." to include in what will be committed) zram/err.logThis file will be cleaned up when execute 'make clean'Link: https://lore.kernel.org/r/20241211004625.5308-1-lizhijian@fujitsu.comCc: Shuah Khan Signed-off-by: Li Zhijian Signed-off-by: Shuah Khan List of files: /linux/tools/testing/selftests/zram/.gitignore