projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
902af36
d434405
)
Merge tag 'v5.12-rc7' into ecryptfs/next
author
Tyler Hicks
<code@tyhicks.com>
Mon, 19 Apr 2021 04:39:17 +0000
(
04:39
+0000)
committer
Tyler Hicks
<code@tyhicks.com>
Mon, 19 Apr 2021 04:39:17 +0000
(
04:39
+0000)
Required to pick up idmapped mount changes which changed some function
parameters.
1
2
fs/ecryptfs/crypto.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
fs/ecryptfs/crypto.c
Simple merge