diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-29 11:57:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-29 11:57:08 +0000 |
| commit | 7082e811fdedd165abf44baf5541a279e4645026 (patch) | |
| tree | b92197739ee1bad1c730942a3bf07579025aed35 /usr/src/uts/sparc | |
| parent | dbeef7f762c59b1461e27146a764182be5eab8cb (diff) | |
| parent | 5ceaf02ccc1885ec3499b7d79f2a80ce1325b4d8 (diff) | |
| download | illumos-joyent-7082e811fdedd165abf44baf5541a279e4645026.tar.gz | |
[illumos-gate merge]
commit 5ceaf02ccc1885ec3499b7d79f2a80ce1325b4d8
8433 vmxnet3: warnings about not supported properties don't help anything
commit f862e02cb8d597e430ef5067be483718a65c3370
7962 strxfrm() fails for certain characters
commit 5206305f06cf80338a34e00287f3336069e1198b
1198 date formats contain spaces where not expected
commit 5549034d757a8b1a23f3957d95e4e9e440c44ebf
8428 8367 breaks cmlb module install on sparc
commit 73177167911de9eef96901d8f6d3cb6be7c67574
8309 libbsm should support AUE_sudo audit event
commit b4203d757c7c247e39c94c09a94021a3a8121062
8228 cstyle: Remove space-tab sequences in /* All Rights Reserved */
commit bec2e3ffadac8d3536ea115d636d06c7b561623a
8212 manpages contain obsolete references
6019 sleep can't be infinite
Conflicts:
usr/src/man/man1m/zonecfg.1m
usr/src/man/man1/mdb.1
Diffstat (limited to 'usr/src/uts/sparc')
| -rw-r--r-- | usr/src/uts/sparc/cmlb/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/uts/sparc/sys/inline.h | 4 | ||||
| -rw-r--r-- | usr/src/uts/sparc/sys/machsig.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/sparc/sys/old_procfs.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/sparc/cmlb/Makefile b/usr/src/uts/sparc/cmlb/Makefile index d66ea89566..e17426bf77 100644 --- a/usr/src/uts/sparc/cmlb/Makefile +++ b/usr/src/uts/sparc/cmlb/Makefile @@ -39,6 +39,7 @@ UTSBASE = ../.. MODULE = cmlb OBJECTS = $(CMLB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(CMLB_OBJS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) # # Include common rules. diff --git a/usr/src/uts/sparc/sys/inline.h b/usr/src/uts/sparc/sys/inline.h index c8d78e6202..bd84cbad4e 100644 --- a/usr/src/uts/sparc/sys/inline.h +++ b/usr/src/uts/sparc/sys/inline.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* @@ -31,8 +31,6 @@ #ifndef _SYS_INLINE_H #define _SYS_INLINE_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4 11.9 */ - #ifdef __cplusplus extern "C" { #endif diff --git a/usr/src/uts/sparc/sys/machsig.h b/usr/src/uts/sparc/sys/machsig.h index 1a53e47083..17b390eb57 100644 --- a/usr/src/uts/sparc/sys/machsig.h +++ b/usr/src/uts/sparc/sys/machsig.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* diff --git a/usr/src/uts/sparc/sys/old_procfs.h b/usr/src/uts/sparc/sys/old_procfs.h index bd85977a5d..c1cd527566 100644 --- a/usr/src/uts/sparc/sys/old_procfs.h +++ b/usr/src/uts/sparc/sys/old_procfs.h @@ -25,7 +25,7 @@ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ #ifndef _SYS_OLD_PROCFS_H #define _SYS_OLD_PROCFS_H |