From: Kalle Valo <kvalo@kernel.org>
To: netdev@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Subject: Re: pull-request: wireless-next-2024-06-07
Date: Fri, 07 Jun 2024 12:42:27 +0300 [thread overview]
Message-ID: <87wmn1ks1o.fsf@kernel.org> (raw)
In-Reply-To: <20240607093517.41394C2BBFC@smtp.kernel.org> (Kalle Valo's message of "Fri, 7 Jun 2024 09:35:17 +0000 (UTC)")
Kalle Valo <kvalo@kernel.org> writes:
> Hi,
>
> here's a pull request to net-next tree, more info below. Please let me know if
> there are any problems.
>
> Kalle
>
> The following changes since commit 83127ecada257e27f4740dbca9644dd0e838bc36:
>
> Merge tag 'wireless-next-2024-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next (2024-05-08 19:09:38 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git tags/wireless-next-2024-06-07
>
> for you to fetch changes up to a46300b1b09ba260c2c2b00f06f6e34482a8ec01:
>
> Merge tag 'ath-next-20240605' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath (2024-06-05 21:29:56 +0300)
>
> ----------------------------------------------------------------
> wireless-next patches for v6.11
>
> The first "new features" pull request for v6.11 with changes both in
> stack and in drivers. Nothing out of ordinary, except that we have two
> conflicts this time:
>
> CONFLICT (content): Merge conflict in net/mac80211/cfg.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/microchip/wilc1000/netdev.c
The wilc1000 conflict is too complex for my liking and I want to
apologize for that. Here's a direct link to linux-next code, hopefully
it helps fixing it:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/net/wireless/microchip/wilc1000/netdev.c#n964
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2024-06-07 9:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-07 9:35 pull-request: wireless-next-2024-06-07 Kalle Valo
2024-06-07 9:42 ` Kalle Valo [this message]
2024-06-11 1:00 ` 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=87wmn1ks1o.fsf@kernel.org \
--to=kvalo@kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).