Hi Dan, On Wed, 27 Oct 2021 13:46:31 -0700 Dan Williams <dan.j.williams@xxxxxxxxx> wrote: > > My merge resolution is here [1]. Christoph, please have a look. The > rebase and the merge result are both passing my test and I'm now going > to review the individual patches. However, while I do that and collect > acks from DM and EROFS folks, I want to give Stephen a heads up that > this is coming. Primarily I want to see if someone sees a better > strategy to merge this, please let me know, but if not I plan to walk > Stephen and Linus through the resolution. It doesn't look to bad to me (however it is a bit late in the cycle :-( ). Once you are happy, just put it in your tree (some of the conflicts are against the current -rc3 based version of your tree anyway) and I will cope with it on Monday. You could do a test merge against next-<date>^^ (that leaves out Andrew's patch series) and if you think there is anything tricky please send me a "git diff-tree --cc HEAD" after you have resolved the conflicts to your satisfaction and committed the test merge or just point me at the test merge in a tree somewhere (like this one). -- Cheers, Stephen Rothwell
Attachment:
pgperEhWVZzjb.pgp
Description: OpenPGP digital signature
