From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jul 2016 17:47:24 +0000 (-0700)
Subject: Merge tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: Ubuntu-4.10.0-19.21~2942
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ba4f67899f9b3091744da4a4ce4057123ed02c4e;p=mirror_ubuntu-artful-kernel.git

Merge tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "This set includes two trivial changes, one to use kmemdup and another
  to control the log level of recovery messages"

* tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: Use kmemdup instead of kmalloc and memcpy
  dlm: add log_info config option
---

ba4f67899f9b3091744da4a4ce4057123ed02c4e