From: Jakub Kicinski <kuba@kernel.org>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: [GIT PULL] wireless-next-2026-11-16
Date: Mon, 16 Nov 2026 16:45:41 -0800 [thread overview]
Message-ID: <20261116164541.3adf8979@kernel.org> (raw)
In-Reply-To: <20261116122302.1501378-3-johannes@sipsolutions.net>
On Mon, 16 Nov 2026 13:20:08 +0100 Johannes Berg wrote:
> net/mac80211/link.c
> -> two conflicts, use the new version
> (the sync issue was fixed already implicitly in the new one)
I shied away from doing this and followed Mark's resolution.
AI wasn't convinced that taking -next is good enough, or maybe
I fumbled the edit.. Either way, I assume it's more expedient
to do the merge the way I did and let you fix up on top as needed
next prev parent reply other threads:[~2026-11-17 0:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 12:20 [GIT PULL] wireless-next-2026-11-16 Johannes Berg
2026-11-17 0:45 ` Jakub Kicinski [this message]
2026-11-17 9:36 ` Johannes Berg
2026-11-17 0:50 ` patchwork-bot+netdevbpf
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=20261116164541.3adf8979@kernel.org \
--to=kuba@kernel.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.