Re: [v2,06/20] brcm80211: constify usb_device_id

Kalle Valo
2017-08-10T08:58:26Z

Arvind Yadav <arvind.yadav.cs@gmail.com> wrote:

> usb_device_id are not supposed to change at runtime. All functions
> working with usb_device_id provided by <linux/usb.h> work with
> const usb_device_id. So mark the non-const structs as const.
>
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>

Does not apply to wireless-drivers-next:

error: Failed to merge in the changes.
Applying: brcm80211: constify usb_device_id
Using index info to reconstruct a base tree...
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
Patch failed at 0001 brcm80211: constify usb_device_id
The copy of the patch that failed is found in: .git/rebase-apply/patch

Patch set to Changes Requested.

--