diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
| commit | 68aaf4459556b1f9370c259fd486aecad2257552 (patch) | |
| tree | 99d92536a3263634969be6b70a96facea85a0df1 /fs/cifs/connect.c | |
| parent | nfp: add AMDA0058 boards to firmware list (diff) | |
| parent | Merge tag 'nfs-for-5.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| download | linux-dev-68aaf4459556b1f9370c259fd486aecad2257552.tar.xz linux-dev-68aaf4459556b1f9370c259fd486aecad2257552.zip | |
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>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 2 |
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; |