Hi all,
Today's linux-next merge of the btrfs tree got conflicts in:
fs/btrfs/inode.c
fs/btrfs/space-info.c
between commits:
3d45f221ce62 ("btrfs: fix deadlock when cloning inline extent and low on free
metadata space")
e076ab2a2ca7 ("btrfs: shrink delalloc pages instead of full inodes
On Fri, May 01, 2020 at 10:28:25AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the btrfs tree got a conflict in:
>
> fs/btrfs/tree-log.c
>
> between commit:
>
> f135cea30de5 ("btrfs: fix partial loss of prealloc extent past i_size after
> fsync")
>
> from the
On 2020/5/1 上午9:05, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 1 May 2020 10:24:53 +1000 Stephen Rothwell
> wrote:
>>
>> Today's linux-next merge of the btrfs tree got a conflict in:
>>
>> fs/btrfs/transaction.c
>>
>> between commit:
>>
>> fcc99734d1d4 ("btrfs: transaction: Avoid deadlo
Hi all,
On Fri, 1 May 2020 10:24:53 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the btrfs tree got a conflict in:
>
> fs/btrfs/transaction.c
>
> between commit:
>
> fcc99734d1d4 ("btrfs: transaction: Avoid deadlock due to bad initialization
> timing of fs_info::journal_
Hi all,
Today's linux-next merge of the btrfs tree got a conflict in:
fs/btrfs/tree-log.c
between commit:
f135cea30de5 ("btrfs: fix partial loss of prealloc extent past i_size after
fsync")
from the btrfs-fixes tree and commit:
e94d318f12cd ("btrfs: fix partial loss of prealloc extent
Hi all,
Today's linux-next merge of the btrfs tree got a conflict in:
fs/btrfs/transaction.c
between commit:
fcc99734d1d4 ("btrfs: transaction: Avoid deadlock due to bad initialization
timing of fs_info::journal_info")
from the btrfs-fixes tree and commit:
f12ca53a6fd6 ("btrfs: force c
6 matches
Mail list logo
