IronPort-SDR: 1Prd8WTl4p+gv9bEvBbuqJi0aDBc/Wl15wmNTKr0PcOmJ6GYtL9cjRaKt4nvDBkWMKfX/hArYt
 UtxFDJc4+s1a/2juDDlsQbHpCfSNVft928qnqChJimSBCwR0zjN09SfZL6V+GMB9PP9lQX8FkL
 rlrvgJ6DPDJPZ+p2RRviSr5TQcr6FPDzn4UXdynaNLoIFYXhK7fbDIjFzuWH9vzVY4nuqfRgHA
 OsKdR7W5sslGqlYYr9WvnVGD1AHHhIPyX6TThHYIowYbJf1rBaQGL9bCXh2zFBQFvhGTCCPXE4
 AZM=
IronPort-SDR: SvI6HkQ/mNJT8KAKREz0ngieLtKq+yyuSUAfBokP0QF7YRt5+LAYCRsKVXDUCrHOzUKC5/zvCx
 GRnSs9OBbBkmAT6rcWM26o6ekPPsNsW4tBWFHUokcwTl7JHW2LloAIMCRr/E7H/An5SbEpRyu0
 POe3MXGgZ0INZy7euhQKGmfICEbegOiwHBleVlNahqpaFBCAjlfXi9wuM4Daf7aibG9FJHm+mt
 wWL/qKthb+ihP8AnpptHYNo5BsPWheK2mFFewgzJstdQU+1ExzKmPbcWYUM3UOlhIKt+nMt+Fa
 5bo=
WDCIronportException: Internal
Message-ID: <1631b427-9efd-cd26-5dbc-0143097f859b@opensource.wdc.com>
Date:   Tue, 24 Jan 2023 07:31:18 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Subject: Re: linux-next: manual merge of the zonefs tree with the
 vfs-idmapping tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Damien Le Moal <Damien.LeMoal@wdc.com>,
        Christian Brauner <christian@brauner.io>,
        Seth Forshee <sforshee@kernel.org>
Cc:     Christian Brauner <brauner@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20230124085951.59eb8da3@canb.auug.org.au>
From:   Damien Le Moal <damien.lemoal@opensource.wdc.com>
Organization: Western Digital Research
In-Reply-To: <20230124085951.59eb8da3@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 1/24/23 06:59, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the zonefs tree got a conflict in:
> 
>   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")

Indeed, these patches touch zonefs. linux-fsdevel is high traffic and I
missed these patches as I was not on the distribution list. I never acked
these changes. Not cool, to say the least.

> from the vfs-idmapping tree and commits:
> 
>   4008e2a0b01a ("zonefs: Reorganize code")
>   d207794ababe ("zonefs: Dynamically create file inodes when needed")
> 
> from the zonefs tree.
> 
> This is a bit of a mess :-(

Yes.

> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks for that. Do you want me to rebase my for-6.3/for-next branch on
these patches ? I need to retest everything anyway, so I might as well do
that.

-- 
Damien Le Moal
Western Digital Research