]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge branch 'dsa-bcm_sf2-do-not-rely-on-kexec_in_progress'
authorDavid S. Miller <davem@davemloft.net>
Sat, 22 Oct 2016 20:17:54 +0000 (16:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 22 Oct 2016 20:17:54 +0000 (16:17 -0400)
Florian Fainelli says:

====================
net: dsa: bcm_sf2: Do not rely on kexec_in_progress

These are the two patches following the discussing we had on kexec_in_progress.

Feel free to apply or discard them, thanks!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge