]> Gentwo Git Trees - linux/.git/commitdiff
gentwo / linux / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd8b964 3e45553)
Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Feb 2025 01:51:23 +0000 (12:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Feb 2025 01:51:23 +0000 (12:51 +1100)
1  2 
security/apparmor/apparmorfs.c patch | diff1 | diff2 | blob | history
security/apparmor/lsm.c patch | diff1 | diff2 | blob | history

diff --cc security/apparmor/apparmorfs.c
Simple merge
diff --cc security/apparmor/lsm.c
Simple merge
Development tree.