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

Stephen Rothwell wrote: > This is now a conflict between the fscache tree and Linus' tree. I've rebased to -rc1 and repushed. David

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

Hi all, On Thu, 11 Feb 2021 21:24:37 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/pagemap.h > > between commits: > > 13aecd8259dc ("mm: Implement readahead_control pageset expansion") > 9a28f7e68602 ("netfs:

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

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/pagemap.h between commit: 13aecd8259dc ("mm: Implement readahead_control pageset expansion") from the fscache tree and commit: 3ad6bba07ad0 ("mm/filemap: add mapping_seek_hole_data") from the

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

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/pagemap.h between commits: 13aecd8259dc ("mm: Implement readahead_control pageset expansion") 9a28f7e68602 ("netfs: Rename unlock_page_fscache() and wait_on_page_fscache()") from the fscache tree

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

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/pagemap.h between commits: fa4910177245 ("vm: Add wait/unlock functions for PG_fscache") 13aecd8259dc ("mm: Implement readahead_control pageset expansion") from the fscache tree and commits: