Re: cross-merges with MFD tree (was: Re: GFS2: Pull Request)

On Tue, 28 May 2019, Jacek Anaszewski wrote: > Hi Linus, > > On 5/8/19 7:55 PM, Linus Torvalds wrote: > > On Wed, May 8, 2019 at 4:49 AM Andreas Gruenbacher > > wrote: > > > > > > There was a conflict with commit 2b070cfe582b ("block: remove the i > > > argument to bio_for_each_segment_all") o

cross-merges with MFD tree (was: Re: GFS2: Pull Request)

Hi Linus, On 5/8/19 7:55 PM, Linus Torvalds wrote: On Wed, May 8, 2019 at 4:49 AM Andreas Gruenbacher wrote: There was a conflict with commit 2b070cfe582b ("block: remove the i argument to bio_for_each_segment_all") on Jens's block layer changes which you've already merged. I've resolved that