lkml.org 
[lkml]   [2015]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the block tree with the btrfs tree
Hi Jens,

Today's linux-next merge of the block tree got a conflict in:

fs/btrfs/volumes.c

between commits:

da2f0f74cf7d ("Btrfs: add support for blkio controllers")
3a9508b0221d ("btrfs: fix compile when block cgroups are not enabled")

from the btrfs tree and commit:

0e28997ec476 ("btrfs: remove bio splitting and merge_bvec_fn() calls")

from the block tree.

I fixed it up (I removed breakup_stripe_bio) and can carry the fix as
necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au


\
 
 \ /
  Last update: 2015-08-24 06:41    [W:0.252 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site