diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-17 12:00:11 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-11-17 12:00:11 +0000 |
| commit | 275d73b3f371fe2c5b2e67a1c86ef4b5781ac33c (patch) | |
| tree | 9d7d1d59320de0686fa2fbf770be55d114ee628d /usr/src/uts/common/os | |
| parent | d3ca33877d23e01eff12715a6c2466f5340f622d (diff) | |
| parent | 68ecb2ec930c4b0f00acaf8e0abb2b19c4b8b76f (diff) | |
| download | illumos-joyent-275d73b3f371fe2c5b2e67a1c86ef4b5781ac33c.tar.gz | |
[illumos-gate merge]
commit 68ecb2ec930c4b0f00acaf8e0abb2b19c4b8b76f
6393 zfs receive a full send as a clone
commit 3d729aecc03ea6ebb9bd5d56b8dccd24f57daa41
6342 want signalfd support
commit f9eb9fdf196b6ed476e4ffc69cecd8b0da3cb7e7
6451 ztest fails due to checksum errors
Conflicts:
usr/src/uts/sparc/Makefile.sparc
usr/src/uts/common/os/sig.c
usr/src/uts/common/io/signalfd.c
Diffstat (limited to 'usr/src/uts/common/os')
| -rw-r--r-- | usr/src/uts/common/os/sig.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/usr/src/uts/common/os/sig.c b/usr/src/uts/common/os/sig.c index 5ef12f3ae4..b3887c16c2 100644 --- a/usr/src/uts/common/os/sig.c +++ b/usr/src/uts/common/os/sig.c @@ -60,7 +60,6 @@ #include <sys/cyclic.h> #include <sys/dtrace.h> #include <sys/sdt.h> -#include <sys/brand.h> #include <sys/signalfd.h> const k_sigset_t nullsmask = {0, 0, 0}; |