diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
| commit | b2a878de11251b06be144b5905e37dd0dc0b0104 (patch) | |
| tree | f510ac1263ebd939493c3358408325804f7ba6e2 /fs/cifs/connect.c | |
| parent | staging: rtl8712: r8712_xmit_classifier(): Change return values and type (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.tar.xz linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.zip | |
Merge 5.3-rc4 into staging-next
We need the iio/staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index a4830ced0f98..a15a6e738eb5 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1113,6 +1113,7 @@ cifs_demultiplex_thread(void *p) mempool_resize(cifs_req_poolp, length + cifs_min_rcv); set_freezable(); + allow_signal(SIGKILL); while (server->tcpStatus != CifsExiting) { if (try_to_freeze()) continue; |