linux-next: manual merge of the akpm-current tree with the btrfs-kdave tree

2018-12-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: fs/btrfs/extent_io.c between commit: e42c38c80535 ("btrfs: Refactor main loop in extent_readpages") from the btrfs-kdave tree and commit: "fs: don't open code lru_to_page()" from the akpm-current tree. I fixe

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

2018-10-05 Thread Omar Sandoval
On Fri, Oct 05, 2018 at 03:47:21PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/swap.h > > between commit: > > 0f83d16b8f1f ("mm: split SWP_FILE into SWP_ACTIVATED and SWP_FS") > > from the btrfs-kdave t

linux-next: manual merge of the akpm-current tree with the btrfs-kdave tree

2018-10-04 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/swap.h between commit: 0f83d16b8f1f ("mm: split SWP_FILE into SWP_ACTIVATED and SWP_FS") from the btrfs-kdave tree and commit: 26833300651e ("mm, swap: fix race between swapoff and some swap opera