Subject: Re: pull-request: wireless-next-2024-06-07

From: Kalle Valo <[email-masked]>
Date: Fri, 07 Jun 2024 12:42:27 +0300

Kalle Valo <[email-masked]> 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