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)
commit860e0217fcc9c52013d2dde0b5953fdc95276fc1
tree46054ef8f49526b1744873ae61ce82e31eb6ba37
parent2a73306b6096fafd5c2ae06ded1f92bbacb39df2
parent4a2947e32ea9ca2bc36d68022b7d7b1014dca18f
Merge branch 'dsa-bcm_sf2-do-not-rely-on-kexec_in_progress'

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>