diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-12-03 17:04:19 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-12-03 17:04:19 -0500 |
| commit | 78e9cda14c469f1472a5b7f9136f39763ef6b6d1 (patch) | |
| tree | 08e14771d63792b79af7be9f167839fba5bed9f0 /manifest | |
| parent | 107d7284fd3e1f373c2dbd0f316e1fa5a6f2deec (diff) | |
| parent | 0ed46b36ccecd85802b9c871aa442b736ec0de30 (diff) | |
| download | illumos-joyent-78e9cda14c469f1472a5b7f9136f39763ef6b6d1.tar.gz | |
[illumos-gate merge]
commit 0ed46b36ccecd85802b9c871aa442b736ec0de30
14243 sys/stddef.h: __builtin_offsetof is available from gcc 4.1
commit 74079a53e205d2eeb75b215833ddc684a1db3088
14092 imc(7D) should not be under i86pc
Conflicts:
manifest
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -689,6 +689,8 @@ f kernel/drv/amd64/i8042 0755 root sys f kernel/drv/amd64/icmp 0755 root sys f kernel/drv/amd64/icmp6 0755 root sys f kernel/drv/amd64/igb 0755 root sys +f kernel/drv/amd64/imc 0755 root sys +f kernel/drv/amd64/imcstub 0755 root sys f kernel/drv/amd64/intel_nb5000 0755 root sys f kernel/drv/amd64/intel_nhm 0755 root sys f kernel/drv/amd64/intel_nhmex 0755 root sys @@ -865,6 +867,7 @@ f kernel/drv/i40e.conf 0644 root sys f kernel/drv/icmp.conf 0644 root sys f kernel/drv/icmp6.conf 0644 root sys f kernel/drv/igb.conf 0644 root sys +f kernel/drv/imc.conf 0644 root sys f kernel/drv/intel_nb5000.conf 0644 root sys f kernel/drv/intel_nhm.conf 0644 root sys f kernel/drv/intel_nhmex.conf 0644 root sys @@ -1928,8 +1931,6 @@ f platform/i86pc/kernel/drv/amd64/cpc 0755 root sys f platform/i86pc/kernel/drv/amd64/cpudrv 0755 root sys f platform/i86pc/kernel/drv/amd64/dr 0755 root sys f platform/i86pc/kernel/drv/amd64/fipe 0755 root sys -f platform/i86pc/kernel/drv/amd64/imc 0755 root sys -f platform/i86pc/kernel/drv/amd64/imcstub 0755 root sys f platform/i86pc/kernel/drv/amd64/ioat 0755 root sys f platform/i86pc/kernel/drv/amd64/isa 0755 root sys f platform/i86pc/kernel/drv/amd64/npe 0755 root sys @@ -1943,7 +1944,6 @@ f platform/i86pc/kernel/drv/amd_iommu.conf 0644 root sys f platform/i86pc/kernel/drv/cpc.conf 0644 root sys f platform/i86pc/kernel/drv/dr.conf 0644 root sys f platform/i86pc/kernel/drv/fipe.conf 0644 root sys -f platform/i86pc/kernel/drv/imc.conf 0644 root sys f platform/i86pc/kernel/drv/ioat.conf 0644 root sys f platform/i86pc/kernel/drv/pci-ide.conf 0644 root sys f platform/i86pc/kernel/drv/pit_beep.conf 0644 root sys |