Re: linux-next: manual merge of the akpm-current tree with the fscache tree

From: David Howells
Date: Tue Mar 02 2021 - 14:30:18 EST

Next message: Anton Yakovlev: "[PATCH v7 8/9] ALSA: virtio: introduce PCM channel map support"
Previous message: Michael Walle: "Re: [RFC PATCH] mtd: add OTP (one-time-programmable) erase ioctl"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> This is now a conflict between the fscache tree and Linus' tree.

I've rebased to -rc1 and repushed.

David

Next message: Anton Yakovlev: "[PATCH v7 8/9] ALSA: virtio: introduce PCM channel map support"
Previous message: Michael Walle: "Re: [RFC PATCH] mtd: add OTP (one-time-programmable) erase ioctl"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]