OpenBSD/src XPo07VQsys/dev/ic aic79xx.c, sys/dev/pci if_bnxtreg.h if_iwxreg.h

   spelling
   feedback and ok tb@ jmc@ ok ratchov@
VersionDeltaFile
1.4+40-40sys/dev/pci/if_bnxtreg.h
1.34+29-29sys/dev/pci/if_iwxreg.h
1.67+27-27sys/dev/pci/if_iwmreg.h
1.67+23-23sys/dev/ic/aic79xx.c
1.113+20-20sys/dev/pci/if_em_hw.c
1.97+20-20sys/dev/pcmcia/if_malo.c
+159-159309 files not shown
+1,018-1,018315 files

OpenBSD/src f785a0esys/dev/ic aacreg.h aac_tables.h

   Add a few more cpu types from freebsd driver found on serveraid-8k board.
   Tested by apelsin.

   ok deraadt@
VersionDeltaFile
1.11+6-1sys/dev/ic/aacreg.h
1.5+4-1sys/dev/ic/aac_tables.h
+10-22 files

OpenBSD/src 8c4b330sys/dev/ic aacreg.h

   Bump bus space size limit to fit all possible registers of the roket
   chipset.

   ok deraadt@
VersionDeltaFile
1.10+2-2sys/dev/ic/aacreg.h
+2-21 files

OpenBSD/src d4c34fbsys/dev/ic aacreg.h anreg.h

   attribute packed -> __packed

   ok miod@ a while ago, ok pyr@
VersionDeltaFile
1.9+45-45sys/dev/ic/aacreg.h
1.11+17-17sys/dev/ic/anreg.h
+62-622 files

OpenBSD/src 76d5c08sys/dev/ic aac.c aacreg.h, sys/dev/pci aac_pci.c

   Add support for the Adaptec RAID-On-Chip architecture.  This in turn
   provides support for the Adaptec 2130S and 2230SLP adapters.

   From FreeBSD

   ok dlg@
VersionDeltaFile
1.30+80-1sys/dev/ic/aac.c
1.18+17-2sys/dev/pci/aac_pci.c
1.8+16-1sys/dev/ic/aacreg.h
1.6+4-2sys/dev/ic/aacvar.h
+117-64 files

OpenBSD/src a0dea67sys/dev/ic aac.c aacreg.h, sys/dev/pci aac_pci.c

   Major improvements to the aac(4) device driver.
   - decouple the command structures from scsi structures, allowing non block
   oriented commands (e.g. management commands) to be built.
   - redesign the various command queues to remove race conditions and to allow
   commands from multiple sources to coexist in the system
   - move major processing of commands and messages to a dedicated kernel
   thread to avoid spending too long in the interrupt handler
   - add device data structures for various management commands to the header
   file

   Much code from FreeBSD
VersionDeltaFile
1.25+2,429-1,277sys/dev/ic/aac.c
1.7+1,046-392sys/dev/ic/aacreg.h
1.5+353-99sys/dev/ic/aacvar.h
1.16+22-17sys/dev/pci/aac_pci.c
1.3+2-2sys/dev/ic/aac_tables.h
+3,852-1,7875 files

OpenBSD/src c0e23c8sys/arch/amd64/amd64 db_disasm.c, sys/arch/mvme88k/dev cl.c vs.c

   Merge with the trunk
VersionDeltaFile
1.5.4.9+624-819sys/arch/mvme88k/dev/cl.c
1.1.2.1+1,318-6sys/arch/amd64/amd64/db_disasm.c
1.2.2.2+643-605sys/dev/microcode/aic7xxx/aic79xx_seq.h
1.7.4.2+955-264sys/dev/pci/if_em.c
1.2.4.10+476-586sys/arch/mvme88k/dev/vs.c
1.2.4.4+381-653sys/arch/mvme88k/dev/vsreg.h
+4,397-2,9331,419 files not shown
+25,529-21,4831,425 files

OpenBSD/src 9700011sys/dev/ic aac_tables.h aacreg.h, sys/dev/pci aac_pci.c pcidevs

   Add support for Dell CERC SATA.  ok krw@, henning@ & deraadt@
VersionDeltaFile
1.11+4-1sys/dev/pci/aac_pci.c
1.2+2-1sys/dev/ic/aac_tables.h
1.738+2-1sys/dev/pci/pcidevs
1.6+2-1sys/dev/ic/aacreg.h
+10-44 files

OpenBSD/src 4455034sys/arch/mvme88k/mvme88k m88100_fp.S eh.S, sys/dev/pci if_em_hw.c pcidevs_data.h

   Merge of current from two weeks agointo the SMP branch
VersionDeltaFile
1.6.4.6+2,185-1,969sys/arch/mvme88k/mvme88k/m88100_fp.S
1.8.4.7+1,526-1,864sys/arch/mvme88k/mvme88k/eh.S
1.1.8.1+2,407-903sys/dev/pci/if_em_hw.c
1.220.2.15+946-1,826sys/dev/pci/pcidevs_data.h
1.95.2.10+1,724-932sys/net/pf.c
1.7.4.1+1,507-1,009sys/dev/pci/if_em.c
+10,295-8,5032,242 files not shown
+77,002-62,3532,248 files

OpenBSD/src 25a503dsys/dev/ic aacreg.h siopreg.h, sys/dev/isa mcdreg.h

   convert __attribute__((__packed__)) to __packed so that parsers unaware
   of gcc extensions have more of a chance.
   ok mcbride@, no objections from millert@, deraadt@
VersionDeltaFile
1.28+19-19sys/netinet/icmp6.h
1.13+13-13sys/netinet/ip6.h
1.6+8-8sys/dev/isa/mcdreg.h
1.5+7-7sys/dev/ic/aacreg.h
1.8+7-7sys/dev/ic/siopreg.h
1.4+6-6sys/dev/ic/cacreg.h
+60-6020 files not shown
+116-11626 files

OpenBSD/src f65d637sys/dev/ic aic7xxx.c, sys/dev/microcode/isp asm_2300.h asm_2200.h

   Sync the SMP branch with 3.3
VersionDeltaFile
1.1.4.2+5,928-5,185sys/dev/microcode/isp/asm_2300.h
1.18.6.9+5,761-4,683sys/dev/ic/aic7xxx.c
1.2.4.4+5,053-4,975sys/dev/microcode/isp/asm_2200.h
1.2.4.4+4,725-4,689sys/dev/microcode/isp/asm_2100.h
1.2.2.1+3,216-4,195sys/dev/microcode/typhoon/3c990img.h
1.95.2.6+2,253-2,836sys/net/pf.c
+26,936-26,5632,711 files not shown
+141,820-113,1112,717 files

OpenBSD/src e2cc21csys/arch/sparc/dev zs.c, sys/dev/ic aic7xxx.c

   sync to -current
VersionDeltaFile
1.34.2.2+5,756-4,661sys/dev/ic/aic7xxx.c
1.2.6.2+3,216-4,195sys/dev/microcode/typhoon/3c990img.h
1.29.4.3+831-1,528sys/arch/sparc/dev/zs.c
1.8.10.1+1,333-860sys/dev/microcode/aic7xxx/aic7xxx.seq
1.3.10.2+1,100-810sys/dev/microcode/aic7xxx/aic7xxx_seq.h
1.2.2.2+1,441-11sys/dev/pci/noct.c
+13,677-12,0651,366 files not shown
+51,823-38,5581,372 files

OpenBSD/src 41279aesys/dev/ic aacreg.h, sys/dev/isa fdlink.h

   no , after last element in a enum
VersionDeltaFile
1.4+2-2sys/dev/ic/aacreg.h
1.6+2-2sys/dev/usb/umidivar.h
1.7+2-2sys/dev/isa/fdlink.h
+6-63 files

OpenBSD/src 2687dc1sys/arch/hp300/hp300 pmap.c, sys/arch/mac68k/mac68k locore.s pmap.c

   Merge in -current from two days ago in the SMP branch.
   As usual with merges, they do not indicate progress, so do not hold
   your breath for working SMP, and do not mail me and ask about the
   state of it.  It has not changed.  There is work ongoing, but very, very
   slowly.  The commit is done in parts as to not lock up the tree in too
   big chunks at a time.
VersionDeltaFile
1.22.6.2+992-1,180sys/arch/mac68k/mac68k/locore.s
1.34.2.3+1,025-1,011sys/netinet/ip_ah.c
1.32.2.3+956-983sys/netinet/ip_esp.c
1.14.4.2+1,017-891sys/arch/hp300/hp300/pmap.c
1.16.4.1+881-926sys/arch/mac68k/mac68k/pmap.c
1.79.2.3+1,045-752sys/netinet/ip_ipsp.c
+5,916-5,7431,702 files not shown
+39,387-40,9061,708 files

OpenBSD/src a184395sys/dev/pci pci_map.c pccbb.c

   Make pci_mapreg_map take an extra argument where we can
   put a size limitation of the PCI region to map.  That makes the PERC 3/Di
   raid controller usable, as it publishes too much PCI memory for us to map
   in the kernel virtual memory.  As we only access the first 256 byte it is
   of no use to map 128MB of kvm.
VersionDeltaFile
1.5+16-6sys/dev/pci/pci_map.c
1.20+8-7sys/dev/pci/pccbb.c
1.57+6-7sys/dev/pci/ncr.c
1.11+6-6sys/dev/pci/eso.c
1.7+4-6sys/dev/pci/if_lmc_obsd.c
1.11+5-5sys/dev/pci/gdt_pci.c
+45-3738 files not shown
+138-13044 files

OpenBSD/src 9c7d2a2sys/dev/ic isp.c awi.c, sys/dev/pci pcidevs_data.h ti_fw2.h

   merge in approximately 2.9 into SMP branch
VersionDeltaFile
1.220.2.4+2,072-3,196sys/dev/pci/pcidevs_data.h
1.2.4.2+2,880-2,189sys/dev/pci/ti_fw2.h
1.12.2.3+2,681-2,040sys/dev/ic/isp.c
1.1.2.1+2,421-2,193sys/dev/ic/awi.c
1.3.2.2+1,273-1,407sys/dev/ic/adwlib.c
1.10.2.1+1,763-667sys/dev/usb/usbdevs_data.h
+13,090-11,6921,409 files not shown
+86,451-59,4091,415 files

OpenBSD/src 7fae452sys/arch/mvme88k/include frame.h, sys/compat/ibcs2 ibcs2_timeb.h

   s/packed/__packed__/
VersionDeltaFile
1.2+20-20sys/dev/ic/aacreg.h
1.3+2-2sys/arch/mvme88k/include/frame.h
1.3+2-2sys/dev/ic/uhareg.h
1.5+2-2sys/compat/ibcs2/ibcs2_timeb.h
+26-264 files

OpenBSD/src f8cb0afshare/man/man4 aac.4, sys/dev/ic aac.c aacreg.h

   Adaptec "FSA" RAID driver
VersionDeltaFile
1.1+1,937-0sys/dev/ic/aac.c
1.1+717-0sys/dev/ic/aacreg.h
1.1+341-0sys/dev/ic/aacvar.h
1.1+203-0sys/dev/pci/aac_pci.c
1.1+121-0sys/dev/ic/aac_tables.h
1.1+56-0share/man/man4/aac.4
+3,375-04 files not shown
+3,397-810 files