From: Linus Torvalds Date: Thu, 23 Oct 2008 17:43:36 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: Ubuntu-5.2.0-15.16~32387 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=db563fc2e80534f98c7f9121a6f7dfe41f177a79;p=mirror_ubuntu-eoan-kernel.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: handle the TCP_Server_Info->tsk field more carefully cifs: fix unlinking of rename target when server doesn't support open file renames [CIFS] improve setlease handling [CIFS] fix saving of resume key before CIFSFindNext cifs: make cifs_rename handle -EACCES errors [CIFS] fix build error [CIFS] undo changes in cifs_rename_pending_delete if it errors out cifs: track DeletePending flag in cifsInodeInfo cifs: don't use CREATE_DELETE_ON_CLOSE in cifs_rename_pending_delete [CIFS] eliminate usage of kthread_stop for cifsd [CIFS] Add nodfs mount option --- db563fc2e80534f98c7f9121a6f7dfe41f177a79