Changes in Kconfig

cb9f145f638d7afa633632a9290d6ad06caeb8ee - Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark

Sat, 01 Nov 2025 13:47:30 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-next-robclarkBack-merge drm-next to get caught up.Signed-off-by: Rob Clark List of files: /linux/security/apparmor/Kconfig

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

Tue, 16 Sep 2025 12:53:20 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerge in order to get the commit: 048832a3f400 ("drm/i915: Refactor shmem_pwrite() to use kiocb and write_iter")To drm-intel-gt-next as there are followup fixes to be applied.Signed-off-by: Joonas Lahtinen List of files: /linux/security/apparmor/Kconfig

a53d0cf7f1cb3182ad533ff5cacfa5fd29c419ad - Merge commit 'linus' into core/bugs, to resolve conflicts

Tue, 05 Aug 2025 11:15:34 +0200

Merge commit 'linus' into core/bugs, to resolve conflictsResolve conflicts with this commit that was developed in parallelduring the merge window: 8c8efa93db68 ("x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust") Conflicts: arch/riscv/include/asm/bug.h arch/x86/include/asm/bug.hSigned-off-by: Ingo Molnar List of files: /linux/security/apparmor/Kconfig

8b87f67b4c87452e21721887fa8dec1f4c6b2b7c - Merge branch 'next' into for-linus

Wed, 08 Oct 2025 06:53:13 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.18 merge window. List of files: /linux/security/apparmor/Kconfig

4b051897df2375414587a245ecb9bb1a4d26b3b8 - Merge tag 'v6.17-rc2' into HEAD

Thu, 21 Aug 2025 20:46:49 +0200

Merge tag 'v6.17-rc2' into HEADSync up with mainline to bring in changes to include/linux/sprintf.h List of files: /linux/security/apparmor/Kconfig

b4d90dbc4c1bc4bd3eb2d2989330af0eb95c98e8 - Merge drm/drm-next into drm-misc-next-fixes

Mon, 15 Sep 2025 10:23:28 +0200

Merge drm/drm-next into drm-misc-next-fixesBackmerging to drm-misc-next-fixes to get features and fixes fromv6.17-rc6.Signed-off-by: Thomas Zimmermann List of files: /linux/security/apparmor/Kconfig

702fdf3513b045f596f836d9a4b8672c76f11834 - Merge drm/drm-next into drm-intel-next

Wed, 10 Sep 2025 14:01:42 +0200

Merge drm/drm-next into drm-intel-nextCatching up with some display dependencies.Signed-off-by: Rodrigo Vivi List of files: /linux/security/apparmor/Kconfig

ca994e8922f25f7fed2075098f185cf198109eaa - Merge drm/drm-next into drm-xe-next

Tue, 12 Aug 2025 14:58:37 +0200

Merge drm/drm-next into drm-xe-nextBring v6.17-rc1 to propagate commits from other subsystems, particularlyPCI, which has some new functions needed for SR-IOV integration.Signed-off-by: Lucas De Marchi List of files: /linux/security/apparmor/Kconfig

08c51f5bddc81c8c97c1eb11861b0dc009e5ccd8 - Merge drm/drm-next into drm-misc-n

Mon, 11 Aug 2025 14:37:45 +0200

Merge drm/drm-next into drm-misc-nUpdating drm-misc-next to the state of v6.17-rc1. Begins a new releasecycle.Signed-off-by: Thomas Zimmermann List of files: /linux/security/apparmor/Kconfig

8d2b0853add1d7534dc0794e3c8e0b9e8c4ec640 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 11 Aug 2025 16:49:06 +0200

Merge drm/drm-fixes into drm-misc-fixesUpdating drm-misc-fixes to the state of v6.17-rc1. Begins a new releasecycle.Signed-off-by: Thomas Zimmermann List of files: /linux/security/apparmor/Kconfig

37a3741d27b64012ab6a5d9c92b514b977349dbb - Revert "apparmor: use SHA-256 library API instead of crypto_shash API"

Mon, 30 Jun 2025 09:06:22 +0200

Revert "apparmor: use SHA-256 library API instead of crypto_shash API"This reverts commit e9ed1eb8f6217e53843d82ecf2d50f8d1a93e77c.Eric has requested that this patch be taken through the libcrypto-nexttree, instead.Signed-off-by: John Johansen List of files: /linux/security/apparmor/Kconfig

e9ed1eb8f6217e53843d82ecf2d50f8d1a93e77c - apparmor: use SHA-256 library API instead of crypto_shash API

Mon, 28 Apr 2025 21:04:30 +0200

apparmor: use SHA-256 library API instead of crypto_shash APIThis user of SHA-256 does not support any other algorithm, so thecrypto_shash abstraction provides no value. Just use the SHA-256library API instead, which is much simpler and easier to use.Signed-off-by: Eric Biggers Signed-off-by: John Johansen List of files: /linux/security/apparmor/Kconfig

4b65b859f55b036649a4525f09fa7c5bbbab384e - Merge tag 'libcrypto-conversions-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux

Tue, 29 Jul 2025 03:05:46 +0200

Merge tag 'libcrypto-conversions-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linuxPull crypto library conversions from Eric Biggers: "Convert fsverity and apparmor to use the SHA-2 library functions instead of crypto_shash. This is simpler and also slightly faster"* tag 'libcrypto-conversions-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux: fsverity: Switch from crypto_shash to SHA-2 library fsverity: Explicitly include apparmor: use SHA-256 library API instead of crypto_shash API List of files: /linux/security/apparmor/Kconfig

f93c27092a5b61b2ac1a29f1d063a15eb09512f2 - apparmor: use SHA-256 library API instead of crypto_shash API

Mon, 30 Jun 2025 19:48:05 +0200

apparmor: use SHA-256 library API instead of crypto_shash APIThis user of SHA-256 does not support any other algorithm, so thecrypto_shash abstraction provides no value. Just use the SHA-256library API instead, which is much simpler and easier to use.Acked-by: John Johansen Link: https://lore.kernel.org/r/20250630174805.59010-1-ebiggers@kernel.orgSigned-off-by: Eric Biggers List of files: /linux/security/apparmor/Kconfig

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/security/apparmor/Kconfig

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/security/apparmor/Kconfig

60a2f25de7b8b785baee2932db932ae9a5b8c86d - Merge drm/drm-next into drm-intel-gt-next

Thu, 16 May 2024 09:33:01 +0200

Merge drm/drm-next into drm-intel-gt-nextSome display refactoring patches are needed in order to allow conflict-less merging.Signed-off-by: Tvrtko Ursulin List of files: /linux/security/apparmor/Kconfig

06d07429858317ded2db7986113a9e0129cd599b - Merge drm/drm-next into drm-intel-next

Thu, 29 Feb 2024 10:57:56 +0100

Merge drm/drm-next into drm-intel-nextSync to get the drm_printer changes to drm-intel-next.Signed-off-by: Jani Nikula List of files: /linux/security/apparmor/Kconfig

2e21dee6a46a66e4c2ced778485e1044101edee4 - Merge branch 'for-6.9/amd-sfh' into for-linus

Wed, 13 Mar 2024 21:17:33 +0100

Merge branch 'for-6.9/amd-sfh' into for-linus- assorted fixes and optimizations for amd-sfh (Basavaraj Natikar)Signed-off-by: Jiri Kosina List of files: /linux/security/apparmor/Kconfig

41c177cf354126a22443b5c80cec9fdd313e67e1 - Merge tag 'drm-misc-next-2024-02-08' into msm-next

Sun, 11 Feb 2024 21:34:07 +0100

Merge tag 'drm-misc-next-2024-02-08' into msm-nextMerge the drm-misc tree to uprev MSM CI.Signed-off-by: Rob Clark List of files: /linux/security/apparmor/Kconfig