lkml.org 
[lkml]   [2021]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] wilc1000: Convert static "chipid" variable to device-local variable
From
Date
David Mosberger-Tang <davidm@egauge.net> 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@egauge.net>

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@egauge.net/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

\
 
 \ /
  Last update: 2021-12-21 19:12    [W:0.228 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site