On Wed, Jul 16, 2025 at 10:11:27AM GMT, Jeff Johnson wrote: > On 7/16/2025 5:56 AM, Manivannan Sadhasivam via B4 Relay wrote: > > Merging Strategy > > ================ > > > > Even though there is no build dependency between PCI core and atheros > > patches, > > there is a functional dependency. So I'd recommend creating an immutable > > branch > > with PCI patches and merging that branch into both PCI and linux-wireless > > trees > > and finally merging the atheros patches into linux-wireless tree. > > > > If immutable branch seems like a hassle, then PCI core patches could get > > merged > > for 6.17 and atheros patches can wait for 6.18. > > I'm fine with either strategy. In the first case I'd merge the immutable > branch into the ath tree. Note I plan to issue my final PR to linux-wireless > for the 6.17 merge window on Monday, so we should close on this decision soon. >
Looks like there are a couple of things that need to be fixed before this series gets merged. So we can defer the whole series for 6.18. - Mani -- மணிவண்ணன் சதாசிவம்
