diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-02-10 13:04:44 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-02-10 13:04:44 +0000 |
commit | c0a9613eaf9bafe0e991bc6273e008fd2b11db9f (patch) | |
tree | 4e2d581e05744f03504b384e01a7ea0477dc8840 /usr/src/cmd/diff/diffh.c | |
parent | 5ae8d2a82dbf2dc1b22ae6755ecefed000d7532e (diff) | |
parent | 4812581794004eff0af2b765b832403b30bf64ab (diff) | |
download | illumos-joyent-c0a9613eaf9bafe0e991bc6273e008fd2b11db9f.tar.gz |
[illumos-gate merge]
commit 4812581794004eff0af2b765b832403b30bf64ab
4996 rtld _init race leads to incorrect symbol values
commit 1f2ca518aeecee8616fccc0c46a339773faea7d5
4863 illumos-gate can't be built with fresh perl versions
commit 386e9c9ebfe4116f62e7a0950acd30564fc60125
5566 elfexec is overzealous with vpages
5572 elfexec and mapelfexec can disagree on aux vectors
commit 8a986bad744c8a479dfacfcdc16bcad15bbb1ec6
5101 privileges(5) manual page missing some privileges
Conflicts:
usr/src/uts/common/exec/elf/elf.c
usr/src/tools/env/illumos.sh
usr/src/man/man5/privileges.5
usr/src/cmd/sgs/rtld/common/util.c
usr/src/Makefile.master
Diffstat (limited to 'usr/src/cmd/diff/diffh.c')
0 files changed, 0 insertions, 0 deletions