Re: [PATCH V4 3/8] wifi: mac80211: Add support for ACPI WBRF

Johannes Berg
2023-06-21T14:25:24Z

On Wed, 2023-06-21 at 09:12 -0500, Limonciello, Mario wrote:
> >
> > But then the next question anyway is how we merge this? The wifi parts
> > sort of depend on the first patch, although technically I guess I could
> > merge them since it's all hidden behind the CONFIG_ symbol, assuming you
> > get that in via some other tree it can combine upstream.
> >
> > I'd also say you can merge those parts elsewhere but I'm planning to
> > also land some locking rework that I've been working on, so it will
> > probably conflict somewhere.
> Since it's all gated by CONFIG_ACPI_WBRF for each subsystem that it touches,
> my take is that we should merge like this:
>
> 1) Get A-b/R-b on patch 1 (ACPI patch) from Rafael.
> 2) Merge mac80211 bits through WLAN trees
> 3) Merge AMDGPU bits *and* ACPI bits through amd-staging-drm-next
> followed by drm tree
>
> Since WLAN and AMDGPU bits are using the exported ACPI functions from
> patch 1, we need to make sure that it is accepted and won't change
> interface before merging other bits.

Right.

> Everything can come together in the upstream tree and the bots
> will be able to test linux-next as well this way.

Yeah, that's what I thought.

Sounds good to me!

Oh, also, since it's pretty late in the cycle I'm assuming for now that
you're not aiming this for 6.5 anymore. If you still are, it all would
probably need to happen very quickly.

johannes