5215 smbd core dump with missing negotiate challenge
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
5216 failover error: cannot share pool/folder - smb add share failed
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Vitaliy Gusev <vitaliy.gusev@nexenta.com>
Reviewed by: Boris Protopopov <boris.protopopov@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
5217 Add cache timeout settings to idmapd manifest, increase defaults
Reviewed by: Gordon Ross <gwr@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
5303 libpthread.3lib incorrectly describes -lpthread semantics
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Approved by: Gordon Ross <gwr@nexenta.com>
5005 libnvpair JSON output broken by lint fixes
5006 libnvpair JSON cannot print int16 arrays
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Gordon Ross <gwr@nexenta.com>
5285 pass in cpu_pause_func via pause_cpus
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Gordon Ross <gwr@nexenta.com>
5279 cleanup gcc warning for cmd/ls
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Robert Mustacchi <rm@joyent.com>
4674 No need to undefine rptr in ip.c
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
5255 uts shouldn't open-code ISP2
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Robert Mustacchi <rm@joyent.com>
5288 x86 bitmap inline asm functions duplicate code
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
5256 document some nonsensical code in the px driver
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Robert Mustacchi <rm@joyent.com>
	[illumos-gate merge]

commit 0716b62f878e855b94635ef4793ef5f7f2abb8e4
    5256 document some nonsensical code in the px driver
commit 7e33f252cf7e3c3ee6c4ad7a90480f5aea3a026c
    5288 x86 bitmap inline asm functions duplicate code
commit de710d24d2fae4468e64da999e1d952a247f142c
    5255 uts shouldn't open-code ISP2
commit 59b0aa363020bcc817969e1c15ac920d3f866e83
    4674 No need to undefine rptr in ip.c
commit 29e6ab979fdbd9d598f44c73c34496040e817685
    5279 cleanup gcc warning for cmd/ls
commit 0ed5c46e82c989cfa9726d9dae452e3d24ef83be
    5285 pass in cpu_pause_func via pause_cpus
commit 37c79205ad46187f54b2edbf6a468160935f14d9
    5005 libnvpair JSON output broken by lint fixes
    5006 libnvpair JSON cannot print int16 arrays
commit 556ec55e431687f7cbda8dfa59e1fb2671d79031
    5303 libpthread.3lib incorrectly describes -lpthread semantics
commit 3f1de28d23e9724b017260ef6b282b278b6e38f9
    5217 Add cache timeout settings to idmapd manifest, increase defaults
commit f4427914317470f516ca69daaed90f7efb3d76dc
    5216 failover error: cannot share pool/folder - smb add share failed
commit f9bc6dadd79442185db5c8eb201c7475554fc7d7
    5215 smbd core dump with missing negotiate challenge

Conflicts:
	usr/src/test/util-tests/tests/libnvpair_json/json_common.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_07_nested_arrays.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_06_nested.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_05_strings.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_04_number_arrays.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_03_empty_arrays.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_02_numbers.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_01_boolean.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/json_00_blank.ksh (copyright)
	usr/src/test/util-tests/tests/libnvpair_json/Makefile (copyright)
	usr/src/test/util-tests/tests/Makefile (upstream mismerge)