From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel•com>,
Johannes Berg <johannes@sipsolutions•net>
Cc: Johannes Berg <johannes.berg@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the iwlwifi-next tree with Linus' tree
Date: Thu, 8 May 2025 13:48:35 +1000 [thread overview]
Message-ID: <20250508134835.34bb82e2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 795 bytes --]
Hi all,
Today's linux-next merge of the iwlwifi-next tree got a conflict in:
drivers/net/wireless/intel/iwlwifi/mld/agg.c
between commit:
60d418e85404 ("wifi: iwlwifi: mld: fix BAID validity check")
from Linus' tree and commit:
cc2b6a0bf340 ("wifi: iwlwifi: mld: remove one more error in unallocated BAID")
from the iwlwifi-next tree.
I fixed it up (I just used the latter version) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-08 3:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-08 3:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2025-05-14 6:41 ` Johannes Berg
2025-05-14 7:36 ` 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=20250508134835.34bb82e2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=johannes.berg@intel$(echo .)com \
--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