Changes in Makefile

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/Makefile

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/Makefile

2ace52718376fdb56aca863da2eebe70d7e2ddb1 - Merge branch 'objtool/core'

Fri, 21 Nov 2025 11:21:20 +0100

Merge branch 'objtool/core'Bring in the UDB and objtool data annotations to avoid conflicts while further extending the bug exceptions.Signed-off-by: Peter Zijlstra List of files: /linux/security/apparmor/Makefile

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/Makefile

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/Makefile

d325efac5938efa3c2a25df72a1bd1af16cd0ed8 - Merge branch 'for-6.18/core' into for-linus

Tue, 30 Sep 2025 16:31:10 +0200

Merge branch 'for-6.18/core' into for-linus- allow HID-BPF to rebind a driver to hid-multitouch (Benjamin Tissoires)- Change hid_driver to use a const char* for .name (Rahul Rameshbabu) List of files: /linux/security/apparmor/Makefile

71b28769d708f20046fc6f853cf93fb88a8b6e11 - Merge remote-tracking branch 'origin' into for-6.18/intel-thc-hid

Fri, 19 Sep 2025 17:08:20 +0200

Merge remote-tracking branch 'origin' into for-6.18/intel-thc-hidNeeded as a basisi for followup support for quicki2c advanced BIOS features.Signed-off-by: Jiri Kosina List of files: /linux/security/apparmor/Makefile

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/Makefile

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/Makefile

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/Makefile

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/Makefile

9e293d47bfb9e812196670f2deeefc8b9d0226e4 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Tue, 12 Aug 2025 01:15:41 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpfCross merge bpf/master after 6.17-rc1.No conflict.Signed-off-by: Martin KaFai Lau List of files: /linux/security/apparmor/Makefile

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/Makefile

0074281bb6316108e0cff094bd4db78ab3eee236 - Merge commit '6e64f4580381e32c06ee146ca807c555b8f73e24' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next

Thu, 07 Aug 2025 09:55:19 +0200

Merge commit '6e64f4580381e32c06ee146ca807c555b8f73e24' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next List of files: /linux/security/apparmor/Makefile

8b45c6c90af6702b2ad716e148b8bcd5231a8070 - Merge tag 'apparmor-pr-2025-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

Mon, 04 Aug 2025 17:17:28 +0200

Merge tag 'apparmor-pr-2025-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmorPull apparmor updates from John Johansen: "This has one major feature, it pulls in a cleaned up version of af_unix mediation that Ubuntu has been carrying for years. It is placed behind a new abi to ensure that it does cause policy regressions. With pulling in the af_unix mediation there have been cleanups and some refactoring of network socket mediation. This accounts for the majority of the changes in the diff. In addition there are a few improvements providing minor code optimizations. several code cleanups, and bug fixes. Features: - improve debug printing - carry mediation check on label (optimization) - improve ability for compiler to optimize __begin_current_label_crit_section - transition for a linked list of rulesets to a vector of rulesets - don't hardcode profile signal, allow it to be set by policy - ability to mediate caps via the state machine instead of lut - Add Ubuntu af_unix mediation, put it behind new v9 abi Cleanups: - fix typos and spelling errors - cleanup kernel doc and code inconsistencies - remove redundant checks/code - remove unused variables - Use str_yes_no() helper function - mark tables static where appropriate - make all generated string array headers const char *const - refactor to doc semantics of file_perm checks - replace macro calls to network/socket fns with explicit calls - refactor/cleanup socket mediation code preparing for finer grained mediation of different network families - several updates to kernel doc comments Bug fixes: - fix incorrect profile->signal range check - idmap mount fixes - policy unpack unaligned access fixes - kfree_sensitive() where appropriate - fix oops when freeing policy - fix conflicting attachment resolution - fix exec table look-ups when stacking isn't first - fix exec auditing - mitigate userspace generating overly large xtables"* tag 'apparmor-pr-2025-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor: (60 commits) apparmor: fix: oops when trying to free null ruleset apparmor: fix Regression on linux-next (next-20250721) apparmor: fix test error: WARNING in apparmor_unix_stream_connect apparmor: Remove the unused variable rules apparmor: fix: accept2 being specifie even when permission table is presnt apparmor: transition from a list of rules to a vector of rules apparmor: fix documentation mismatches in val_mask_to_str and socket functions apparmor: remove redundant perms.allow MAY_EXEC bitflag set apparmor: fix kernel doc warnings for kernel test robot apparmor: Fix unaligned memory accesses in KUnit test apparmor: Fix 8-byte alignment for initial dfa blob streams apparmor: shift uid when mediating af_unix in userns apparmor: shift ouid when mediating hard links in userns apparmor: make sure unix socket labeling is correctly updated. apparmor: fix regression in fs based unix sockets when using old abi apparmor: fix AA_DEBUG_LABEL() apparmor: fix af_unix auditing to include all address information apparmor: Remove use of the double lock apparmor: update kernel doc comments for xxx_label_crit_section apparmor: make __begin_current_label_crit_section() indicate whether put is needed ... List of files: /linux/security/apparmor/Makefile

95ff11895846eec76a19351a109fbabbdd86b417 - apparmor: make all generated string array headers const char *const

Wed, 09 Apr 2025 03:02:00 +0200

apparmor: make all generated string array headers const char *constaddress_family_names and sock_type_names were created as const char *a[],which declares them as (non-const) pointers to const chars. Since thepointers themselves would not be changed, they should be generated asconst char *const a[].Signed-off-by: Ryan Lee Signed-off-by: John Johansen List of files: /linux/security/apparmor/Makefile

c05e705812d179f4b85aeacc34a555a42bc4f9ac - apparmor: add fine grained af_unix mediation

Wed, 07 Sep 2022 21:46:30 +0200

apparmor: add fine grained af_unix mediationExtend af_unix mediation to support fine grained controls based onthe type (abstract, anonymous, fs), the address, and the labelingon the socket.This allows for using socket addresses to label and the socket andcontrol which subjects can communicate.The unix rule format follows standard apparmor rules except that fsbased unix sockets can be mediated by existing file rules. None fsunix sockets can be mediated by a unix socket rule. Where The addressof an abstract unix domain socket begins with the @ character, similarto how they are reported (as paths) by netstat -x. The address thenfollows and may contain pattern matching and any characters includingthe null character. In apparmor null characters must be specified byusing an escape sequence \000 or \x00. The pattern matching is thesame as is used by file path matching so * will not match / eventhough it has no special meaning with in an abstract socket name. Eg. allow unix addr=@*,Autobound unix domain sockets have a unix sun_path assigned to them bythe kernel, as such specifying a policy based address is not possible.The autobinding of sockets can be controlled by specifying the specialauto keyword. Eg. allow unix addr=auto,To indicate that the rule only applies to auto binding of unix domainsockets. It is important to note this only applies to the bindpermission as once the socket is bound to an address it isindistinguishable from a socket that have an addr bound with aspecified name. When the auto keyword is used with other permissionsor as part of a peer addr it will be replaced with a pattern that canmatch an autobound socket. Eg. For some kernels allow unix rw addr=auto,It is important to note, this pattern may match abstract sockets thatwere not autobound but have an addr that fits what is generated by thekernel when autobinding a socket.Anonymous unix domain sockets have no sun_path associated with thesocket address, however it can be specified with the special nonekeyword to indicate the rule only applies to anonymous unix domainsockets. Eg. allow unix addr=none,If the address component of a rule is not specified then the ruleapplies to autobind, abstract and anonymous sockets.The label on the socket can be compared using the standard label=rule conditional. Eg. allow unix addr=@foo peer=(label=bar),see man apparmor.d for full syntax description.Signed-off-by: John Johansen List of files: /linux/security/apparmor/Makefile

7ae9fb1b7ecbb5d85d07857943f677fd1a559b18 - Merge branch 'next' into for-linus

Tue, 21 Feb 2023 20:19:49 +0100

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

6f84981772535e670e4e2df051a672af229b6694 - Merge drm/drm-next into drm-misc-next

Thu, 19 Jan 2023 10:56:12 +0100

Merge drm/drm-next into drm-misc-nextBackmerging into drm-misc-next to get DRM accelerator infrastructure,which is required by ipuv driver.Signed-off-by: Thomas Zimmermann List of files: /linux/security/apparmor/Makefile

407da561244b9d51e6a794d6305ba38ec2c9d907 - Merge tag 'v6.2-rc3' into next

Tue, 10 Jan 2023 05:28:19 +0100

Merge tag 'v6.2-rc3' into nextMerge with mainline to bring in timer_shutdown_sync() API. List of files: /linux/security/apparmor/Makefile