On Wed, Feb 22, 2023 at 10:02:46AM +0900, Damien Le Moal wrote:
> Linus,
>
> The following changes since commit 2241ab53cbb5cdb08a6b2d4688feb13971058f65:
>
> Linux 6.2-rc5 (2023-01-21 16:27:01 -0800)
>
> are available in the Git repository at:
>
> ssh://git@xxxxxxxxxxxxxxxxxxx/pub/scm/linux/kernel/git/dlemoal/zonefs tags/zonefs-6.3-rc1
>
> for you to fetch changes up to 2b188a2cfc4d8f319ad23832ec1390bdae52daf6:
>
> zonefs: make kobj_type structure constant (2023-02-13 08:03:48 +0900)
>
> Please note that this pull request generates a conflict if fs/zonefs/super.c
> between commits:
>
> c1632a0f1120 ("fs: port ->setattr() to pass mnt_idmap")
> f2d40141d5d9 ("fs: port inode_init_owner() to mnt_idmap")
> f861646a6562 ("quota: port to mnt_idmap")
>
> from the vfs-idmapping tree and commits:
>
> 4008e2a0b01a ("zonefs: Reorganize code")
> d207794ababe ("zonefs: Dynamically create file inodes when needed")
>
> from the zonefs tree. The conflict resolution looks very messy but is in fact
> only due to a few lines. I am including the resolution diff below for your
> reference.
Linus just fyi, I referenced this at the end of my pull request as well
but I was under the impression that the merge conflict had been resolved
in the meantime. Since it hasn't, thank you for providing the
resolution, Damien! I appreciate it.
Christian
