projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: faeb20e b81171c)
Merge tag 'dlm-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2016 23:38:36 +0000 (16:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2016 23:38:36 +0000 (16:38 -0700)
commitd77bed0d4c61cb0258851367a36b358dbeb7abcc
tree36b07bcbd2bb7f29abc841281c209091ecea866ftree | snapshot
parentfaeb20ecfa398b043c3224607f512c009c51653dcommit | diff
parentb81171cb6869111dbaf9fb642f4434514c21d696commit | diff
Merge tag 'dlm-4.6' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.