From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Johannes Berg <johannes@sipsolutions•net>
Cc: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel•com>,
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 iwlwifi-next tree with Linus' tree
Date: Wed, 14 May 2025 12:55:24 +1000 [thread overview]
Message-ID: <20250514125524.1528467f@canb.auug.org.au> (raw)
In-Reply-To: <20250514124131.15d0117f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
Hi all,
On Wed, 14 May 2025 12:41:31 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> I keep getting more conflicts in the above files (each time one of them
> get modified in the iwlwifi-next tree. Could you please merge commit
>
> ebedf8b7f05b ("wifi: iwlwifi: add support for Killer on MTL")
>
> or the current net tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main)
> into the iwlwifi-next tree and fix up the conflicts. I believe that
> will clean up all the conflicts - that are really just between bug
> fixes for iwlwifi and the new development).
Or, of course, I assume the iwlwifi-next tree will be merged into the
net-next tree at some point soon ...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-05-14 2:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 1:44 linux-next: manual merge of the iwlwifi-next tree with Linus' tree Stephen Rothwell
2025-05-06 6:26 ` Johannes Berg
2025-05-07 1:10 ` Stephen Rothwell
2025-05-07 5:37 ` Johannes Berg
2025-05-08 3:24 ` Stephen Rothwell
2025-05-14 2:41 ` Stephen Rothwell
2025-05-14 2:55 ` Stephen Rothwell [this message]
2025-05-14 6:41 ` Johannes Berg
2025-05-14 7:36 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-08 3:48 Stephen Rothwell
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=20250514125524.1528467f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miriam.rachel.korenblit@intel$(echo .)com \
/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