aboutsummaryrefslogtreecommitdiff
path: root/fs/reiserfs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2015-09-03 12:57:48 -0700
committerLinus Torvalds2015-09-03 12:57:48 -0700
commit9cbf22b37ae0592dea809cb8d424990774c21786 (patch)
treea995760bb01015b95b0ef1b9e1c39a425e9a68fd /fs/reiserfs/Makefile
parentea814ab9aab23505f6828a0cc01c985e59847f4e (diff)
parentb3a5bbfd780d9e9291f5f257be06e9ad6db11657 (diff)
Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland: "This set mainly includes a change to the way the dlm uses the SCTP API in the kernel, removing the direct dependency on the sctp module. Other odd SCTP-related fixes are also included. The other notable fix is for a long standing regression in the behavior of lock value blocks for user space locks" * tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: print error from kernel_sendpage dlm: fix lvb copy for user locks dlm: sctp_accept_from_sock() can be static dlm: fix reconnecting but not sending data dlm: replace BUG_ON with a less severe handling dlm: use sctp 1-to-1 API dlm: fix not reconnecting on connecting error handling dlm: fix race while closing connections dlm: fix connection stealing if using SCTP
Diffstat (limited to 'fs/reiserfs/Makefile')
0 files changed, 0 insertions, 0 deletions