lkml.org 
[lkml]   [2022]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the device-mapper tree with the block tree
On Thu, Mar 31, 2022 at 09:44:25AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the device-mapper tree got a conflict in:
>
> include/linux/bio.h
>
> between commit:
>
> 57c47b42f454 ("block: turn bio_kmalloc into a simple kmalloc wrapper")
>
> from the block tree and commit:
>
> 135eaaabd22a ("block: allow using the per-cpu bio cache from bio_alloc_bioset")

Isn't this something Jens already had queued up in the block tree?

\
 
 \ /
  Last update: 2022-04-01 07:22    [W:0.068 / U:0.380 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site