From: Daniel Gomez <da.gomez@kernel•org>
To: "Uwe Kleine-König" <ukleinek@kernel•org>
Cc: Daniel Gomez <da.gomez@samsung•com>,
Luis Chamberlain <mcgrof@kernel•org>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Sami Tolvanen <samitolvanen@google•com>,
Petr Pavlu <petr.pavlu@suse•com>,
Andreas Hindborg <a.hindborg@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Michal Wilczynski <m.wilczynski@samsung•com>
Subject: Re: linux-next: manual merge of the pwm tree with the modules tree
Date: Mon, 10 Nov 2025 16:54:01 +0100 [thread overview]
Message-ID: <2b53a2d1-3e86-4558-ba7f-5ce3b1368f0f@kernel.org> (raw)
In-Reply-To: <26c7zdxc4nv3wx25xferlggtjipigtd3tc6fk554g4tmqsuvmr@e6cll772nz2r>
On 10/11/2025 16.42, Uwe Kleine-König wrote:
> Hello Daniel,
>
> On Mon, Nov 10, 2025 at 02:59:15PM +0100, Daniel Gomez wrote:
>> On 07/11/2025 17.44, Uwe Kleine-König wrote:
>>> Hi Daniel,
>>>
>>> On Tue, Nov 04, 2025 at 10:54:15AM +1100, Stephen Rothwell wrote:
>>>> [adding the modules tree contacts]
>>>>
>>>> On Tue, 4 Nov 2025 10:48:27 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>>>>
>>>>> Today's linux-next merge of the pwm tree got a conflict in:
>>>>>
>>>>> rust/macros/module.rs
>>>>>
>>>>> between commits:
>>>>>
>>>>> 3809d7a89fe5 ("rust: module: use a reference in macros::module::module")
>>>>> 0b24f9740f26 ("rust: module: update the module macro with module parameter support")
>>>>>
>>>>> from the modules tree and commit:
>>>>>
>>>>> 927687809649 ("rust: macros: Add support for 'imports_ns' to module!")
>>>
>>> I reshuffled my tree such that the import_ns commit sits directly on top
>>> of 6.18-rc1. The new commit-id is 739ad9be61e5.
>>>
>>>>> from the pwm tree.
>>>>> [...]
>>>>> - if let Some(imports) = info.imports_ns {
>>>>> ++ if let Some(imports) = &info.imports_ns {
>>>>> + for ns in imports {
>>>>> + modinfo.emit("import_ns", &ns);
>>>>> + }
>>>>> + }
>>>
>>> Given that the conflict resolution is non-trivial and we already know
>>> what to do, I suggest you merge my commit into the modules tree.
>>
>> Do you mean creating a separate branch that includes the conflict resolution, to
>> be used as an example when sending the PR?
>
> If I were the module maintainer I'd pull
>
> https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git rust-module-namespace
>
> into my tree and include that into the v6.19-rc1 pull request. That way
> the merge conflict doesn't happen at all for Linus.
That's not my understanding on how to deal with conflicts:
https://docs.kernel.org/maintainer/rebasing-and-merging.html#merging-from-sibling-or-upstream-trees
>
> Best regards
> Uwe
next prev parent reply other threads:[~2025-11-10 15:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 23:48 linux-next: manual merge of the pwm tree with the modules tree Stephen Rothwell
2025-11-03 23:54 ` Stephen Rothwell
2025-11-04 8:48 ` Daniel Gomez
2025-11-04 21:17 ` Stephen Rothwell
2025-11-07 16:44 ` Uwe Kleine-König
2025-11-10 13:59 ` Daniel Gomez
2025-11-10 15:42 ` Uwe Kleine-König
2025-11-10 15:54 ` Daniel Gomez [this message]
2025-11-10 18:32 ` Uwe Kleine-König
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=2b53a2d1-3e86-4558-ba7f-5ce3b1368f0f@kernel.org \
--to=da.gomez@kernel$(echo .)org \
--cc=a.hindborg@kernel$(echo .)org \
--cc=da.gomez@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=m.wilczynski@samsung$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=petr.pavlu@suse$(echo .)com \
--cc=samitolvanen@google$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=ukleinek@kernel$(echo .)org \
/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