Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/test_meminit.c b/lib/test_meminit.c
index 62d19f270cad..9729f271d150 100644
--- a/lib/test_meminit.c
+++ b/lib/test_meminit.c
@@ -222,7 +222,7 @@ static int __init do_kmem_cache_size(size_t size, bool want_ctor,
                  * Copy the buffer to check that it's not wiped on
                  * free().
                  */
-                buf_copy = kmalloc(size, GFP_KERNEL);
+                buf_copy = kmalloc(size, GFP_ATOMIC);
                 if (buf_copy)
                         memcpy(buf_copy, buf, size);