From: Damien Le Moal <damien.lemoal@opensource•wdc.com>
To: Stephen Rothwell <sfr@rothwell•id.au>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Damien Le Moal <Damien.LeMoal@wdc•com>,
Christian Brauner <christian@brauner•io>,
Seth Forshee <sforshee@kernel•org>,
Christian Brauner <brauner@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the zonefs tree with the vfs-idmapping tree
Date: Tue, 24 Jan 2023 09:11:47 +0900 [thread overview]
Message-ID: <8871d62a-b87f-75d6-fb5d-d9811a3e5dae@opensource.wdc.com> (raw)
In-Reply-To: <20230124110745.5c9b78b0@oak.ozlabs.ibm.com>
On 1/24/23 09:07, Stephen Rothwell wrote:
> Hi Damien,
>
> On Tue, 24 Jan 2023 08:30:29 +0900 Damien Le Moal <damien.lemoal@opensource•wdc.com> wrote:
>>
>> OK. I think I will merge the 3 patches that create the conflict and rebase
>> the patches. I need that for retesting at least. But given the size of the
>> conflict resolution, I may push that as an update to my for-6.3/for-next
>> branch. Let me see...
>>
>>> Alternatively, just leave the fix up to Linus (but mention it to him
>>> when you send your pull requests).
>>
>> Understood. Let me retest first :)
>
> When I said "merge", I meant literally "git merge <some stable branch
> from the vfs-mapping tree that contains the conflicting commit>" not
> cherry pick the commits i.e. you would need to coordinate with
> Christian about having a common branch (or making sure that the part of
> his tree you pull in is immutable).
Yep, cherry picking did not work :)
I did a merge test and came up with the same resolution as you did. It
looks good. It looks big but is in fact fairly simple. I will keep it as
is and signal it to Linus when I send my PR.
But retesting everything to be sure there are no issues.
Christian,
Next time, when you touch an fs, please cc the maintainer for acks. I had
that zonefs series ready for a while and we could have coordinated for the
conflict...
--
Damien Le Moal
Western Digital Research
next prev parent reply other threads:[~2023-01-24 0:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 21:59 linux-next: manual merge of the zonefs tree with the vfs-idmapping tree Stephen Rothwell
2023-01-23 22:31 ` Damien Le Moal
2023-01-23 23:25 ` Stephen Rothwell
2023-01-23 23:30 ` Damien Le Moal
2023-01-24 0:07 ` Stephen Rothwell
2023-01-24 0:11 ` Damien Le Moal [this message]
2023-01-24 8:32 ` Christian Brauner
2023-01-24 8:41 ` Damien Le Moal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8871d62a-b87f-75d6-fb5d-d9811a3e5dae@opensource.wdc.com \
--to=damien.lemoal@opensource$(echo .)wdc.com \
--cc=Damien.LeMoal@wdc$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=christian@brauner$(echo .)io \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sforshee@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sfr@rothwell$(echo .)id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox