Message ID | 20240518044601.GA478319@mit.edu |
---|---|
State | New |
Headers | show |
Series | [GIT,PULL] ext4 updates for v6.10-rc1 | expand |
On Fri, 17 May 2024 at 21:46, Theodore Ts'o <tytso@mit.edu> wrote: > > Note that there is a relatively merge conflict; the relatively simple > resolution which I used when running regression tests is at the tag > ext4_merge_resolution in the ext4 git repo, Heh. That tag just points to the same commit you asked me to pull. I think you may have tagged it before you actually committed your merge resolution. That said, the merge resolution looks trivial, so no big deal. When people send me a suggested merge, I usually compare against it just because it's cheap insurance, not because it's usually necessary. But you may want to check that I actually did the same thing you did. Linus
The pull request you sent on Sat, 18 May 2024 00:46:01 -0400:
> https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git tags/ext4_for_linus-6.10-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7991c92f4cc50b971fcb4d05087e490dc47a6857
Thank you!