]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f9b2cb fba133a)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 16 Mar 2025 22:14:42 +0000 (09:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 16 Mar 2025 22:14:42 +0000 (09:14 +1100)
1  2 
fs/ecryptfs/crypto.c patch | diff1 | diff2 | blob | history
fs/ecryptfs/ecryptfs_kernel.h patch | diff1 | diff2 | blob | history

diff --cc fs/ecryptfs/crypto.c
Simple merge
diff --cc fs/ecryptfs/ecryptfs_kernel.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.