summaryrefslogtreecommitdiffstats
path: root/fs/dlm/lock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 16:38:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 16:38:36 -0700
commitd77bed0d4c61cb0258851367a36b358dbeb7abcc (patch)
tree36b07bcbd2bb7f29abc841281c209091ecea866f /fs/dlm/lock.c
parentfaeb20ecfa398b043c3224607f512c009c51653d (diff)
parentb81171cb6869111dbaf9fb642f4434514c21d696 (diff)
downloadlinux-d77bed0d4c61cb0258851367a36b358dbeb7abcc.tar.bz2
Merge tag 'dlm-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland: "Previous changes introduced the use of socket error reporting for dlm sockets. This set includes two fixes in how the socket error callbacks are used" * tag 'dlm-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: DLM: Save and restore socket callbacks properly DLM: Replace nodeid_to_addr with kernel_getpeername
Diffstat (limited to 'fs/dlm/lock.c')
0 files changed, 0 insertions, 0 deletions