diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-01 16:18:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-01 16:18:38 -0800 |
| commit | b7bd29b530b9e8c0456ef703e64e773830185724 (patch) | |
| tree | 18dc768711f45a17923061863bcab3dbe64fd5e8 /net/unix/af_unix.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (diff) | |
| parent | apparmor: Fix aa_label_build() error handling for failed merges (diff) | |
| download | linux-rng-b7bd29b530b9e8c0456ef703e64e773830185724.tar.xz linux-rng-b7bd29b530b9e8c0456ef703e64e773830185724.zip | |
Merge tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
Pull apparmor bug fixes from John Johansen:
"Two bug fixes for apparmor:
- Fix aa_label_build() error handling for failed merges
- Fix warning about unused function apparmor_ipv6_postroute"
* tag 'apparmor-pr-2019-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
apparmor: Fix aa_label_build() error handling for failed merges
apparmor: Fix warning about unused function apparmor_ipv6_postroute
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions