The pull request you sent on Fri, 15 Jan 2021 16:20:29 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
> tags/ext4_for_linus_stable
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0bc9bc1d8b2fa0d5a7e2132e89c540099ea63172
Thank you!
--
Deet-doot
Note: there is a fairly simple merge conflict, which can be resolved
by taking EXT4_SB(sb) and replacing it with sbi using the version in
your tree. My merge resolution (which I used to run regression tests)
is attached below.
- Ted
The following changes
2 matches
Mail list logo