Hi all,
On Tue, 15 Dec 2020 07:12:12 +1100 Stephen Rothwell
wrote:
>
> On Thu, 3 Dec 2020 14:43:48 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the block tree got conflicts in:
> >
> > fs/f2fs/checkpoint.c
> > fs/f2fs/f2fs.h
> > fs/f2fs/super.c
> >
> > between c
Hi all,
On Thu, 3 Dec 2020 14:43:48 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/f2fs/checkpoint.c
> fs/f2fs/f2fs.h
> fs/f2fs/super.c
>
> between commit:
>
> 5c0602188dc7 ("f2fs: fix kbytes written stat for multi-device case")
>
Hi all,
On Thu, 3 Dec 2020 14:43:48 +1100 Stephen Rothwell
wrote:
>
> diff --cc fs/f2fs/checkpoint.c
> index 14ba1519639e,54a1905af052..
> --- a/fs/f2fs/checkpoint.c
> +++ b/fs/f2fs/checkpoint.c
> @@@ -1385,27 -1385,6 +1385,26 @@@ static void commit_checkpoint(struct f2
> f2fs_
On 2020/12/3 11:43, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the block tree got conflicts in:
fs/f2fs/checkpoint.c
fs/f2fs/f2fs.h
fs/f2fs/super.c
between commit:
5c0602188dc7 ("f2fs: fix kbytes written stat for multi-device case")
from the f2fs tree and commits
Hi all,
Today's linux-next merge of the block tree got conflicts in:
fs/f2fs/checkpoint.c
fs/f2fs/f2fs.h
fs/f2fs/super.c
between commit:
5c0602188dc7 ("f2fs: fix kbytes written stat for multi-device case")
from the f2fs tree and commits:
8446fe9255be ("block: switch partition lookup
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/f2fs/segment.c
between commit:
792b84b74b54 ("f2fs: support multiple devices")
from the f2fs tree and commit:
70fd76140a6c ("block,fs: use REQ_* flags directly")
from the block tree.
I fixed it up (see below) an
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/f2fs/data.c
between commits:
19a5f5e2ef37 ("f2fs: drop any block plugging")
52763a4b7a21 ("f2fs: detect host-managed SMR by feature flag")
78682f794479 ("f2fs: fix to avoid reading out encrypted data in page cache
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/f2fs/data.c
between commit:
6d63ed97a1f2 ("f2fs: detect host-managed SMR by feature flag")
from the f2fs tree and commit:
04d328defd06 ("f2fs: use bio op accessors")
from the block tree.
I fixed it up (see below
Hi all,
On Thu, 9 Jun 2016 13:26:09 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/f2fs/data.c
> fs/f2fs/segment.c
>
> between commits:
>
> 0a87f664d1ad ("f2fs: detect congestion of flush command issues")
> 19a5f5e2ef37 ("f2fs: dr
Hi Jens,
Today's linux-next merge of the block tree got conflicts in:
fs/f2fs/data.c
fs/f2fs/segment.c
between commits:
0a87f664d1ad ("f2fs: detect congestion of flush command issues")
19a5f5e2ef37 ("f2fs: drop any block plugging")
from the f2fs tree and commits:
4e49ea4a3d27 ("bloc
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/f2fs/data.c
between commit:
8e5b935bf1ce ("f2fs: maintain extent cache in separated file")
from the f2fs tree and commit:
4246a0b63bd8 ("block: add a bi_error field to struct bio")
from the block tree.
I fixed i
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/f2fs/data.c between various commits from the f2fs tree and commits
2c30c71bd653 ("block: Convert various code to bio_for_each_segment()")
and 4f024f3797c4 ("block: Abstract out bvec iterator") from the block
tree.
I fixed it
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/f2fs/data.c between commits from the f2fs tree and commits 2c30c71bd653
("block: Convert various code to bio_for_each_segment()") and
4f024f3797c4 ("block: Abstract out bvec iterator") from the block tree.
I fixed it up (I h
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/f2fs/data.c between commit 8758e549e105 ("f2fs: add unlikely() macro
for compiler more aggressively") from the f2fs tree and commit
2c30c71bd653 ("block: Convert various code to bio_for_each_segment()")
from the block tree.
Hi Jens,
Today's linux-next merge of the block tree got conflicts in
fs/f2fs/data.c and fs/f2fs/segment.c between commits 0626804cd9a6 ("f2fs:
remove the own bi_private allocation") and 899d7625d85a ("f2fs: refactor
bio-related operations") from the f2fs tree and commits 2c30c71bd653
("block: Conv
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
include/trace/events/f2fs.h between commit 4bfc388c73a1 ("f2fs: adds a
tracepoint for f2fs_submit_read_bio") from the tree and commit
4f024f3797c4 ("block: Abstract out bvec iterator") from the block tree.
I fixed it up (see b
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/f2fs/segment.c between commit a79ad49b87f4 ("f2fs: introduce a bio
array for per-page write bios") from the f2fs tree and commit
4f024f3797c4 ("block: Abstract out bvec iterator") from the block tree.
I fixed it up (see belo
Hi Jens,
Today's linux-next merge of the block tree got a conflict in
fs/f2fs/segment.c between commit cc7b1bb17367 ("f2fs: avoid allocating
failure in bio_alloc") from the f2fs tree and commit ed2d2f9a8265
("block: Abstract out bvec iterator") from the block tree.
I fixed it up (see below) and c
18 matches
Mail list logo
