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

Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a15a6e738eb5..1795e80cbdf7 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1113,7 +1113,7 @@ cifs_demultiplex_thread(void *p)
                 mempool_resize(cifs_req_poolp, length + cifs_min_rcv);
 
         set_freezable();
-        allow_signal(SIGKILL);
+        allow_kernel_signal(SIGKILL);
         while (server->tcpStatus != CifsExiting) {
                 if (try_to_freeze())
                         continue;