Merge branch 'dsa-bcm_sf2-do-not-rely-on-kexec_in_progress'

Browse source

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>

...

This commit is contained in:

David S. Miller 2016-10-22 16:17:54 -04:00

parent 2a73306b60 4a2947e32e

commit 860e0217fc

2 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/net/dsa/bcm_sf2.c

View file

1

kernel/kexec_core.c

View file