Theodore Ts'o <tytso@xxxxxxx> wrote: > > My reading of the email threads is that they're iterating to an actual > > conclusion (I admit, I'm surprised) ... or at least the disagreements > > are getting less. Since the merge window closed this is now a 5.16 > > thing, so there's no huge urgency to getting it resolved next week. > > My read was that it was more that people were just getting exhausted, > and not necessarily that folks were converging. The problem, from where I sit, is that I'd started rebasing my stuff on top of Willy's patches and making use of them in the expectation that they were likely to go in - and I think other people might have been doing that too based on some of the comments. However, that's all been thrown up in the air. Not only did they not get merged in this window, it's not currently looking certain that they'd get merged in the next window either. So what do I do? Do I defoliate my patches - which then risks merge conflicts with the folio patches? Or do I stick with the foliation and hope that Willy's goes in next time? Some guidance as to what's likely to happen to the folio patches would be really appreciated! David
