Hi all,
On Fri, 22 May 2020 13:06:16 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/filesystems/fiemap.rst
>
> between commit:
>
> 469581d9e5c9 ("fs: move fiemap range validation into the file systems
> instances")
>
>
Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/filesystems/fiemap.rst
between commit:
469581d9e5c9 ("fs: move fiemap range validation into the file systems
instances")
from the ext4 tree and commit:
e6f7df74ec1a ("docs: filesystems: convert fiemap
Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/index.rst
between commit:
6684874af063 ("docs: create filesystem internal section")
from the ext4 tree and commit:
85c32d9c6f3e ("doc: move away translations from top-level index")
from the jc_docs tr
3 matches
Mail list logo