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

On Fri, Feb 12, 2021 at 02:04:44PM +1100, Stephen Rothwell wrote: > Hi Ira, > > On Thu, 11 Feb 2021 17:07:41 -0800 Ira Weiny wrote: > > > > On Fri, Feb 12, 2021 at 10:38:10AM +1100, Stephen Rothwell wrote: > > > from the fscache tree and commit: > > > > > > 325a835476e3 ("iov_iter: Remove

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

Hi Ira, On Thu, 11 Feb 2021 17:07:41 -0800 Ira Weiny wrote: > > On Fri, Feb 12, 2021 at 10:38:10AM +1100, Stephen Rothwell wrote: > > from the fscache tree and commit: > > > > 325a835476e3 ("iov_iter: Remove memzero_page() in favor of zero_user()") > > I don't seem to have that commit

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

On Fri, Feb 12, 2021 at 10:38:10AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the btrfs tree got a conflict in: > > lib/iov_iter.c > > between commit: > > 11432a3cc061 ("iov_iter: Add ITER_XARRAY") > > from the fscache tree and commit: > > 325a835476e3

linux-next: manual merge of the btrfs tree with the fscache tree

Hi all, Today's linux-next merge of the btrfs tree got a conflict in: lib/iov_iter.c between commit: 11432a3cc061 ("iov_iter: Add ITER_XARRAY") from the fscache tree and commit: 325a835476e3 ("iov_iter: Remove memzero_page() in favor of zero_user()") from the btrfs tree. I fixed it