Re: [PATCH 00/26] netfs: Keep track of folios in a segmented bio_vec[] chain

[David Howells]

Stefan Metzmacher <metze@xxxxxxxxx> wrote:

> Any idea on how to resolve the actual conflict?

I didn't manage to beat the bugs out in time (turned out several were
preexisting).

However, if you look here:

https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=cifs-next

I've stacked my patchset on top of yours and modified smbdirect_connection.c
appropriately.

David