From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2016 23:38:36 +0000 (-0700)
Subject: Merge tag 'dlm-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: v4.6-rc1~114
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/d77bed0d4c61cb0258851367a36b358dbeb7abcc

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
---

d77bed0d4c61cb0258851367a36b358dbeb7abcc