Re: linux-next: build failure after merge of the block tree

David Sterba
2020-12-14T21:57:22Z

On Tue, Dec 15, 2020 at 08:43:00AM +1100, Stephen Rothwell wrote:
> Hi David,
>
> On Mon, 14 Dec 2020 22:36:12 +0100 David Sterba <dsterba@suse.cz> wrote:
> >
> > On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jens Axboe wrote:
> > > On 12/14/20 1:09 PM, Stephen Rothwell wrote:
> > > > Just a reminder that I am still applying the above merge fix.
> > >
> > > I sent in my core changes, but they haven't been pulled yet. So I guess
> > > we're dealing with a timing situation... David, did you send in the btrfs
> > > pull yet?
> >
> > Yes
> > https://lore.kernel.org/lkml/cover.1607955523.git.dsterba@suse.com/
>
> I would expect you *both* to at least mention this conflict to Linus ...

2nd paragraph in the mail

"There are no merge conflicts against current master branch, in past
weeks some conflicts emerged in linux-next but IIRC were trivial."