śr., 30 paź 2019 o 22:35 Christoph Hellwig <hch@xxxxxxxxxxxxx> napisał(a): > > On Mon, Oct 21, 2019 at 09:29:30PM +0200, Arnd Bergmann wrote: > > > Is Christoph's work in next? The series doesn't apply cleanly on next, > > > I needed to fix a couple conflicts. What branch should I rebase it on > > > before resending? > > > > Not sure, maybe Christoph can comment. > > > > Your patches would best go through the char-misc tree and be based > > on top of that, for Christoph's I think the idea is to have some go > > through the architecture maintainer trees, and have whatever is > > left go through my asm-generic tree. > > Actually I thought of just doing an ioremap tree for this merge window. > > What kind of changes does Bartosz have? I'm kinda missing the context > here. Just the series you've responded to here, but I don't think it should conflict with your changes (not very much anyway). Greg: can this be picked up into char-misc? Bart