Subject: Re: [PATCH net-next 02/12] vxlan: fix race between flush and incoming learning

From: Cong Wang <[email-masked]>
Date: Tue, 11 Jun 2013 00:46:17 +0000 (UTC)

On Mon, 10 Jun 2013 at 20:24 GMT, Stephen Hemminger <[email-masked]> wrote:
> It is possible for a packet to arrive during vxlan_stop(), and
> have a dynamic entry created. Close this by checking if device
> is up.
>
>  CPU1                             CPU2   
> vxlan_stop
>   vxlan_flush
>      hash_lock acquired
>                                   vxlan_encap_recv
>                                      vxlan_snoop
>                                         waiting for hash_lock
>      hash_lock relased
>   vxlan_flush done
>                                         hash_lock acquired
>                                         vxlan_fdb_create
>
> Signed-off-by: Stephen Hemminger <[email-masked]>
>

This doesn't apply with git am.

% git am /tmp/vxlan-fix-02.diff
Applying: vxlan: fix race between flush and incoming learning
error: patch failed: drivers/net/vxlan.c:632
error: drivers/net/vxlan.c: patch does not apply
Patch failed at 0001 vxlan: fix race between flush and incoming learning
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

But can be applied manually... just fyi.