diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 16:38:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 16:38:36 -0700 |
| commit | d77bed0d4c61cb0258851367a36b358dbeb7abcc (patch) | |
| tree | 36b07bcbd2bb7f29abc841281c209091ecea866f /security/apparmor/policy_unpack.c | |
| parent | faeb20ecfa398b043c3224607f512c009c51653d (diff) | |
| parent | b81171cb6869111dbaf9fb642f4434514c21d696 (diff) | |
| download | linux-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 'security/apparmor/policy_unpack.c')
0 files changed, 0 insertions, 0 deletions