diff options
author | David S. Miller <davem@davemloft.net> | 2016-10-22 22:17:54 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-22 22:17:54 +0200 |
commit | 860e0217fcc9c52013d2dde0b5953fdc95276fc1 (patch) | |
tree | 46054ef8f49526b1744873ae61ce82e31eb6ba37 /net/ipv4/sysctl_net_ipv4.c | |
parent | netns: revert "netns: avoid disabling irq for netns id" (diff) | |
parent | net: dsa: bcm_sf2: Do not rely on kexec_in_progress (diff) | |
download | linux-860e0217fcc9c52013d2dde0b5953fdc95276fc1.tar.xz linux-860e0217fcc9c52013d2dde0b5953fdc95276fc1.zip |
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>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
0 files changed, 0 insertions, 0 deletions