+93
−0
Documentation/vm/frontswap.txt
0 → 100644
+278
−0
+33
−17
+1
−1
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts: net/ipv6/route.c This deals with a merge conflict between the net-next addition of the inetpeer network namespace ops, and Thomas Graf's bug fix in 2a0c451a which makes sure we don't register /proc/net/ipv6_route before it is actually safe to do so. Signed-off-by:David S. Miller <davem@davemloft.net>