David Mosberger-Tang <davidm@xxxxxxxxxx> wrote: > Move "chipid" variable into the per-driver structure so the code > doesn't break if more than one wilc1000 module is present. > > Signed-off-by: David Mosberger-Tang <davidm@xxxxxxxxxx> Failed to apply, please rebase on top of wireless-drivers-next. Recorded preimage for 'drivers/net/wireless/microchip/wilc1000/netdev.h' error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Applying: wilc1000: Convert static "chipid" variable to device-local variable Using index info to reconstruct a base tree... M drivers/net/wireless/microchip/wilc1000/netdev.h M drivers/net/wireless/microchip/wilc1000/wlan.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/microchip/wilc1000/wlan.c Auto-merging drivers/net/wireless/microchip/wilc1000/netdev.h CONFLICT (content): Merge conflict in drivers/net/wireless/microchip/wilc1000/netdev.h Patch failed at 0001 wilc1000: Convert static "chipid" variable to device-local variable Patch set to Changes Requested. -- https://patchwork.kernel.org/project/linux-wireless/patch/20211216032612.3798573-1-davidm@xxxxxxxxxx/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
