Changes in .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/lib/.gitignore

25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 - Merge branch 'next' into for-linus

Tue, 21 Jan 2025 06:37:39 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.14 merge window. List of files: /linux/lib/.gitignore

6d4a0f4ea72319c9a37c1a7191695467006dd272 - Merge tag 'v6.13-rc3' into next

Tue, 17 Dec 2024 18:40:45 +0100

Merge tag 'v6.13-rc3' into nextSync up with the mainline. List of files: /linux/lib/.gitignore

77b679453d3364688ff3e5153c0be5b2b52672b7 - Merge tag 'v6.12-rc3' into perf-tools-next

Mon, 14 Oct 2024 19:45:28 +0200

Merge tag 'v6.12-rc3' into perf-tools-nextTo get the fixes in the current perf-tools tree.Signed-off-by: Namhyung Kim List of files: /linux/lib/.gitignore

3fd6c59042dbba50391e30862beac979491145fe - Merge tag 'v6.12-rc1' into clk-meson-next

Mon, 30 Sep 2024 11:28:07 +0200

Merge tag 'v6.12-rc1' into clk-meson-nextLinux 6.12-rc1 List of files: /linux/lib/.gitignore

a0efa2f362a69e47b9d8b48f770ef3a0249a7911 - Merge net-next/main to resolve conflicts

Wed, 09 Oct 2024 08:59:14 +0200

Merge net-next/main to resolve conflictsThe wireless-next tree was based on something older, and thereare now conflicts between -rc2 and work here. Merge net-next,which has enough of -rc2 for the conflicts to happen, resolvingthem in the process.Signed-off-by: Johannes Berg List of files: /linux/lib/.gitignore

b88132ceb3faccdd785809df75f9d490ebaab459 - Merge drm/drm-next into drm-xe-next

Fri, 04 Oct 2024 11:29:21 +0200

Merge drm/drm-next into drm-xe-nextBackmerging to resolve a conflict with core locally.Signed-off-by: Thomas Hellström List of files: /linux/lib/.gitignore

2dd0ef5d951e9b565ddb324fe26c531b6a40bf82 - Merge drm/drm-next into drm-misc-next

Mon, 30 Sep 2024 10:50:54 +0200

Merge drm/drm-next into drm-misc-nextGet drm-misc-next to up v6.12-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/lib/.gitignore

e0568571258d096f0277c74185bcbfc9cf21bccb - Merge drm/drm-next into drm-intel-next

Mon, 30 Sep 2024 10:49:10 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.12-rc1.Signed-off-by: Jani Nikula List of files: /linux/lib/.gitignore

c8d430db8eec7d4fd13a6bea27b7086a54eda6da - Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Sun, 06 Oct 2024 09:59:22 +0200

Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm64 fixes for 6.12, take #1- Fix pKVM error path on init, making sure we do not change critical system registers as we're about to fail- Make sure that the host's vector length is at capped by a value common to all CPUs- Fix kvm_has_feat*() handling of "negative" features, as the current code is pretty broken- Promote Joey to the status of official reviewer, while James steps down -- hopefully only temporarly List of files: /linux/lib/.gitignore

0c436dfe5c25d0931b164b944165259f95e5281f - Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Wed, 02 Oct 2024 21:29:16 +0200

Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.12A bunch of fixes here that came in during the merge window and the firstweek of release, plus some new quirks and device IDs. There's nothingmajor here, it's a bit bigger than it might've been due to there beingno fixes sent during the merge window due to your vacation. List of files: /linux/lib/.gitignore

2cd86f02c017bf9733e5cd891381b7d40f6f37ad - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Tue, 01 Oct 2024 18:09:41 +0200

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesRequired for a panthor fix that broke whenFOP_UNSIGNED_OFFSET was added in place of FMODE_UNSIGNED_OFFSET.Signed-off-by: Maarten Lankhorst List of files: /linux/lib/.gitignore

3a39d672e7f48b8d6b91a09afa4b55352773b4b5 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 27 Sep 2024 08:13:52 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.No conflicts and no adjacent changes.Signed-off-by: Paolo Abeni List of files: /linux/lib/.gitignore

39b3f4e0db5d85aa82678d9e7bc59f5e56667e2e - Merge tag 'hardening-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Wed, 18 Sep 2024 12:12:41 +0200

Merge tag 'hardening-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linuxPull hardening updates from Kees Cook: - lib/string_choices: - Add str_up_down() helper (Michal Wajdeczko) - Add str_true_false()/str_false_true() helper (Hongbo Li) - Introduce several opposite string choice helpers (Hongbo Li) - lib/string_helpers: - rework overflow-dependent code (Justin Stitt) - fortify: refactor test_fortify Makefile to fix some build problems (Masahiro Yamada) - string: Check for "nonstring" attribute on strscpy() arguments - virt: vbox: Replace 1-element arrays with flexible arrays - media: venus: hfi_cmds: Replace 1-element arrays with flexible arrays* tag 'hardening-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: lib/string_choices: Add some comments to make more clear for string choices helpers. lib/string_choices: Introduce several opposite string choice helpers lib/string_choices: Add str_true_false()/str_false_true() helper string: Check for "nonstring" attribute on strscpy() arguments media: venus: hfi_cmds: struct hfi_session_release_buffer_pkt: Add __counted_by annotation media: venus: hfi_cmds: struct hfi_session_release_buffer_pkt: Replace 1-element array with flexible array virt: vbox: struct vmmdev_hgcm_pagelist: Replace 1-element array with flexible array lib/string_helpers: rework overflow-dependent code coccinelle: Add rules to find str_down_up() replacements string_choices: Add wrapper for str_down_up() coccinelle: Add rules to find str_up_down() replacements lib/string_choices: Add str_up_down() helper fortify: use if_changed_dep to record header dependency in *.cmd files fortify: move test_fortify.sh to lib/test_fortify/ fortify: refactor test_fortify Makefile to fix some build problems List of files: /linux/lib/.gitignore

4e9903b0861c9df3464b82db4a7025863bac1897 - fortify: refactor test_fortify Makefile to fix some build problems

Sat, 27 Jul 2024 17:02:36 +0200

fortify: refactor test_fortify Makefile to fix some build problemsThere are some issues in the test_fortify Makefile code.Problem 1: cc-disable-warning invokes compiler dozens of timesTo see how many times the cc-disable-warning is evaluated, changethis code: $(call cc-disable-warning,fortify-source)to: $(call cc-disable-warning,$(shell touch /tmp/fortify-$$$$)fortify-source)Then, build the kernel with CONFIG_FORTIFY_SOURCE=y. You will see alarge number of '/tmp/fortify-' files created: $ ls -1 /tmp/fortify-* | wc 80 80 1600This means the compiler was invoked 80 times just for checking the-Wno-fortify-source flag support.$(call cc-disable-warning,fortify-source) should be added to a simplevariable instead of a recursive variable.Problem 2: do not recompile string.o when the test code is updatedThe test cases are independent of the kernel. However, when the testcode is updated, $(obj)/string.o is rebuilt and vmlinux is relinkeddue to this dependency: $(obj)/string.o: $(obj)/$(TEST_FORTIFY_LOG)always-y is suitable for building the log files.Problem 3: redundant code clean-files += $(addsuffix .o, $(TEST_FORTIFY_LOGS))... is unneeded because the top Makefile globally cleans *.o files.This commit fixes these issues and makes the code readable.Signed-off-by: Masahiro Yamada Link: https://lore.kernel.org/r/20240727150302.1823750-2-masahiroy@kernel.orgSigned-off-by: Kees Cook List of files: /linux/lib/.gitignore

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/lib/.gitignore

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/lib/.gitignore

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/lib/.gitignore

446279168e030fd0ed68e2bba336bef8bb3da352 - Merge part of branch 'for-next.instantiate' into for-next

Fri, 05 Aug 2022 18:37:03 +0200

Merge part of branch 'for-next.instantiate' into for-next List of files: /linux/lib/.gitignore

fc30eea1542dd787c6aa46e970014e97e390c5b2 - Merge drm/drm-next into drm-intel-next

Thu, 04 Aug 2022 16:19:24 +0200

Merge drm/drm-next into drm-intel-nextSync up. In special to get the drm-intel-gt-next stuff.Signed-off-by: Rodrigo Vivi List of files: /linux/lib/.gitignore