Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout

From	Kalle Valo <kvalo@codeaurora.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout
Date	2016-06-17 11:50 +0200
Message-ID	<rKYzv-4PW-13@gated-at.bofh.it> (permalink)
References	<rDw5k-7Db-7@gated-at.bofh.it> <rKHfk-1xv-35@gated-at.bofh.it> <rKUcy-2fy-25@gated-at.bofh.it> <rKUme-2iZ-1@gated-at.bofh.it> <rKUFA-2px-27@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Rafał Miłecki <zajec5@gmail.com> writes:

>>>> Failed to apply, please rebase:
>>>>
>>>> Applying: brcmfmac: fix lockup when removing P2P interface after event timeout
>>>> Using index info to reconstruct a base tree...
>>>> Falling back to patching base and 3-way merge...
>>>> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
>>>> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
>>>> CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
>>>> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
>>>> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>>>> Failed to merge in the changes.
>>>> Patch failed at 0001 brcmfmac: fix lockup when removing P2P interface after event timeout
>>>
>>> What tree did you try it on?
>>>
>>> I just went into a dir where I have cloned:
>>> git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
>>>
>>> My HEAD commit is:
>>> 034fdd4 Merge ath-current from ath.git
>>>
>>> And I can apply this patch cleanly doing:
>>> curl https://patchwork.kernel.org/patch/9138925/mbox/ | git am
>>
>> I was trying to apply this to wireless-drivers-next. I didn't get a
>> confirmation from Arend and I didn't consider the fix important enough
>> for 4.7. But of course I can reconsider if needed.
>
> I think I agree it won't hurt to get it into -next. Noone earlier
> reported this bug and it seems to be there for a long time. Also
> applying it to -next will allow avoiding merge conflicts and immediate
> development work on -next.

Exactly, there is a cost when taking patches to wireless-drivers.git and
that's why I try to keep the bar high. Regressions and user reported
bugs take priority, other fixes are handled case by case.

> I'll resend this patch rebased on -next soon.

Thanks.

-- 
Kalle Valo

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout Kalle Valo <kvalo@codeaurora.org> - 2016-06-16 17:20 +0200
  Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface  after event timeout Rafał Miłecki <zajec5@gmail.com> - 2016-06-17 07:10 +0200
    Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout Kalle Valo <kvalo@codeaurora.org> - 2016-06-17 07:20 +0200
      Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface  after event timeout Rafał Miłecki <zajec5@gmail.com> - 2016-06-17 07:40 +0200
        Re: [PATCH 4.7 FIX] brcmfmac: fix lockup when removing P2P interface after event timeout Kalle Valo <kvalo@codeaurora.org> - 2016-06-17 11:50 +0200

csiph-web