Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: > From: Johannes Berg <johannes.berg@xxxxxxxxx> > > Bit 0 is reserved on 5/6 GHz and bit 1 is reserved on 2.4 GHz, > so the driver should only set the non-reserved bits according > to band. > > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> > Acked-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx> Failed to apply: Recorded preimage for 'drivers/net/wireless/realtek/rtw89/core.c' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Applying: rtw89: fix HE PHY bandwidth capability Using index info to reconstruct a base tree... M drivers/net/wireless/realtek/rtw89/core.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/realtek/rtw89/core.c CONFLICT (content): Merge conflict in drivers/net/wireless/realtek/rtw89/core.c Patch failed at 0001 rtw89: fix HE PHY bandwidth capability Patch set to Changes Requested. -- https://patchwork.kernel.org/project/linux-wireless/patch/20220222195524.1e3cc6f7e4c3.I72ea8a9cad5eff93bcb3a0912727d03605ddb6e6@changeid/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
