CVS log for src/sys/arch/i386/conf/GENERIC

Up to [NetBSD] / src / sys / arch / i386 / conf

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Pull up following revision(s) (requested by hannken in ticket #1715):
- Be robust against an invalid timer period value.
sys/dev/ic/hpetreg.h			Rev. 1.4
sys/dev/ic/hpet.c			Rev. 1.8

- Fix wrong definition of LAPIC_LEVEL_ASSERT / _MASK
sys/arch/x86/include/i82489reg.h	Rev. 1.11

- Add virtio driver - speed up disk and network access in virtual environments
sys/arch/i386/conf/GENERIC		Rev. 1.1055
sys/arch/i386/conf/ALL			Rev. 1.325
sys/arch/amd64/conf/GENERIC		Rev. 1.338
sys/dev/pci/files.pci			Rev. 1.350
sys/dev/pci/if_vioif.c			Rev. 0-1.2
sys/dev/pci/ld_virtio.c			Rev. 0-1.4
sys/dev/pci/viomb.c			Rev. 0-1.1
sys/dev/pci/virtio.c			Rev. 0-1.3
sys/dev/pci/virtioreg.h			Rev. 0-1.1
sys/dev/pci/virtiovar.h			Rev. 0-1.1
distrib/sets/lists/man/mi		Rev. 1.1352 and 1.1358
share/man/man4/Makefile			Rev. 1.573 and 1.575
share/man/man4/ld.4			Rev. 1.19
share/man/man4/virtio.4			Rev. 0-1.4
share/man/man4/vioif.4			Rev. 0-1.2
share/man/man4/viomb.4			Rev. 0-1.2

Allow NetBSD to run unmodified under Linux/kvm.

add a tpm driver from bsssd.sourceforge.net

add cir@emdtv

add & enable digital tv capture support

Use "options<SPC><TAB>CPU_UCODE" to keep the indentation if the option
is commented out.

Support CPU microcode loading via cpuctl(8).
Implemented and enabled via CPU_UCODE kernel config option
for x86 and Xen Dom0.
Tested on different AMD machines with different
CPU families.

ok wiz@ for the manpages
ok releng@
ok core@ via releng@

add uipad

WABPL is no longer considered experimental (has not been for some time)
so update its comment in config files.

adjust English usage in comment

The rnd pseudo-device is not really optional, because it is in the same
source file as the entropy-pool code itself.  Move it to std.  This
will be cleaned up more when I split the sources up as they should be.

This fixes build breaks on several ports.  Thanks to Havard Eidnes for
pointing them out.

Add gpiopwm(4).

Enable nsclpcsio and gpio devices.

Import of the virtio driver written by MINOURA Makoto <minoura@netbsd.org>
with minor changes to make it compile an run on -current.  This driver
speeds up disk and network access in virtual environments like KVM.

Enabled on i386 and amd64.  Tested with a CentOS 5.7 x86_64 host.

See http://ozlabs.org/~rusty/virtio-spec/virtio.pdf for the specification.

Document gpioiic flag in a comment.

Disable gpio(4) which can now be built and used as modules.

Attach gpio* at gpiobus? instead of at individual drivers.

revert previous

Comment out the legacy bktr(4) from the GENERICs.

Sync with HEAD. Most notably: uvm/pmap work done by rmind@, and MP Xen
work of cherry@.

No regression observed on suspend/restore.

Enable some gpio devices.

Attach amdtemp(4) at pchb(4) instead of in place of pchb(4).

Should fix PR#45268.

Add entries for pwdog(4).

remove commented out entries for emdtv, auvitek, and dtv

remove dtv (available as a module)

We have PUFFS, we need putter.

Finish reverting modularization of i386 GENERIC.

Add commented out entries for V7FS and V7FS Endian Independent support.

Enable or note aubtfwl(4) wherever ubt(4) is enabled or noted.

Add cxdtv(4) and urndis(4).  Also, two slight cosmetic changes.

add irmce

A driver for HP 3D DriverGuard; a LIS3LV02DL-based accelerometer. Tested on
HP NC4400. Like aps(4), this is commented out in the GENERIC kernels.

add emdtv at uhub

add dtv at dtvbus

Add back DIAGNOSTIC option to x86 GENERIC kernels, as discussed on tech-kern.
This will have to be commented out on release branches.

Catchup with rmind-uvmplock merge.

By default, enable wmihp(4) instead of hpqlb(4), as it has a better chance
of working with a greater number of HP laptops. Ok cegger@.

Try to attach hpet(4) also via a specific HPET table. Fixes PR kern/43702.

Sync with HEAD.

sync with head

many whitespace cleanup.
confirmed "cvs diff -b" are identical.

Sync with head.

Remove PECOFF/Win32 emulation.

Remove Darwin, MACH and Mach-O support.

sync with head

Add a driver for RDC's vortex86/PMX-1000 SoC PCI/ISA bridge, with support
for the integrated watchdog timer.

Add rdcide(4), a driver for the IDE controller found in RDC's
vortex86/PMX-1000 system-on-chip.

Enable acpicpu(4) by default.

More sync fixes. And add the mbr_gpt files.

Sync with HEAD. TODO before merge:
- shortcut for suspend code in sysmon, when powerd(8) is not running.
Borrow ``xs_watch'' thread context?
- bug hunting in xbd + xennet resume. Rings are currently thrashed upon
resume, so current implementation force flush them on suspend. It's not
really needed.

merge the bouyer-quota2 branch. This adds a new on-disk format
to store disk quota usage and limits, integrated with ffs
metadata. Usage is checked by fsck_ffs (no more quotacheck)
and is covered by the WAPBL journal. Enabled with kernel
option QUOTA2 (added where QUOTA was enabled in kernel config files),
turned on with tunefs(8) on a per-filesystem
basis. mount_mfs(8) can also turn quotas on.

See http://mail-index.netbsd.org/tech-kern/2011/02/19/msg010025.html
for details.

sync with head

Sync with HEAD

Move INTEL_ONDEMAND_CLOCKMOD -- or odcm(4) -- to the cpufeaturebus.

Move acpicpu(4) from "acpinodebus" to "cpufeaturebus".

Move VIA_C7TEMP to the cpufeaturebus.

Move PowerNow! to the cpufeaturebus.

Move ENHANCED_SPEEDSTEP, or henceforth est(4), to the cpufeaturebus.

add alc@pci

Modularize coretemp(4). Ok jmcneill@.

modularize VIA PadLock support
 - retire options VIA_PADLOCK, replace with 'padlock0 at cpu0'
 - driver supports attach & detach
 - support building as a module

add VCONS_DRAW_INTR

Sync with HEAD

Add a skeleton driver for Asus EeePC acpiwmi(4) mappings.

retire azalia from GENERIC

Initial implementation of ibmhawk(4) driver for sensors behind the IBM Hawk
on-board Integrated Systems Management Processor found on some eServers.

Tested on an IBM eServer x335.

Compile FFS and NFS statically (e.g. not modular) for GENERIC. These
file-systems can be critical for mountroot; as kernel cannot have access
to module(7)s without having / mounted first... yes, you see the point.

See http://mail-index.netbsd.org/port-i386/2011/02/11/msg002323.html

XXX Hopefully, /stand does not reside in a separate partition :o

Add missing PUFFS (commented out).

attach drm hw drivers to 'drm' not 'vga'

Add QUOTA2 where QUOTA is enabled (and QUOTA2 commented out where QUOTA
is commented out)

Sync with HEAD

options SPLASHSCREEN_PROGRESS is no more

Add a driver for the RDC Semiconductor RDC R6040 10/100 Ethernet controller,
as found in the vortex86 SoCs (http://www.vortex86dx.com).
Ported from freebsd.
Not added to amd64's GENERIC because this CPU is 32bit only.

thanks to DM&P Electronics, Inc for providing documentation and sample
devices for this work.

Add bwi from PR kern/40279.  There is no know case of testing the
driver on amd64/i386, but if it doesn't work at least we're more
likely to get a PR instead of people wondering about lacking driver
support.

add acpiwdrt

Add a dummy-driver for ACPI fans.

Add a driver for ACPI power meters.

Xref module(7) in comments.

add auvitek at uhub

add 'uaudio* at usbifif?' so uaudio can attach to something other than
a hub

add ihphy

Remove unused count from pseudo-device md.

Pull up following revision(s) (requested by plunky in ticket #1407):
	sys/dev/bluetooth/btdev.h: revision 1.9
	sys/arch/iyonix/conf/GENERIC: revision 1.60
	sys/arch/sparc64/conf/GENERIC: revision 1.129
	sys/dev/usb/hid.c: revision 1.30
	sys/dev/usb/hid.h: revision 1.13
	sys/arch/i386/conf/GENERIC: revision 1.983
	usr.sbin/btdevctl/print.c: revision 1.10
	sys/arch/evbarm/conf/MPCSA_GENERIC: revision 1.16
	sys/arch/alpha/conf/GENERIC: revision 1.337
	sys/dev/bluetooth/files.bluetooth: revision 1.14
	sys/arch/evbarm/conf/GUMSTIX: revision 1.49
	sys/dev/usb/usbdevs: revision 1.550
	sys/arch/evbppc/conf/OPENBLOCKS266_OPT: revision 1.14
	sys/arch/hpcsh/conf/GENERIC: revision 1.91
	sys/dev/bluetooth/btmagic.c: revision 1.1
	distrib/sets/lists/man/mi: revision 1.1210
	sys/arch/amd64/conf/GENERIC: revision 1.279
	sys/arch/i386/conf/ALL: revision 1.258
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.54
	sys/arch/hpcarm/conf/JORNADA720: revision 1.78
	sys/dev/usb/hid.c: revision 1.29
	share/man/man4/btmagic.4: revision 1.1
hid_get_data() does not work if the size of data is less than
a byte and crosses a byte boundary, and it always returns a
sign-extended value.
fix this by using the algorithm from libusbhid to read bytes,
and provide a hid_get_udata() function to return unsigned data
values.
while here, const args
update DPRINTF to reflect actual function name
add Apple Magic Mouse product-id
regen for Magic Mouse id
allow for vendor-id and product-id properties, passing them
through to child devices
add Magic Mouse driver and manpage btmagic(4)
additionally query the "PnP Information" service record to discover
any USB Forum vendor-id and product-id values and store them in the
property list if found.
add btmagic(4) where other Bluetooth drivers are listed

Add new et(4)/etphy(4) devices.

Sync with HEAD.

Enable schide(4), Intel SCH IDE controller driver from PR#42310.

Sync with HEAD.

Merge ACPI Fujitsu Driver.  Provides support for hotkeys and other
built-in components through vendor-specific ACPI devices.

ok jruoho@

add otus

Add acpiwmi(4) mappings for MSI laptops.

XXX: It may be necessary to fix PR # 43659 before this works on all models.

Sync with HEAD (-D20101022).

Merge ACPI display driver.  Provides generic support for brightness
control and output switching, through ACPI video extensions.

TODO: use wsconsctl(8) instead of sysctl(8) for brightness control.

ok jruoho@
also discussed with cegger@ and jmcneill@

sync with head

Import NPF - a packet filter.  Some features:

- Designed to be fully MP-safe and highly efficient.

- Tables/IP sets (hash or red-black tree) for high performance lookups.

- Stateful filtering and Network Address Port Translation (NAPT).
  Framework for application level gateways (ALGs).

- Packet inspection engine called n-code processor - inspired by BPF -
  supporting generic RISC-like and specific CISC-like instructions for
  common patterns (e.g. IPv4 address matching).  See npf_ncode(9) manual.

- Convenient userland utility npfctl(8) with npf.conf(8).

NOTE: This is not yet a fully capable alternative to PF or IPFilter.
Further work (support for binat/rdr, return-rst/return-icmp, common ALGs,
state saving/restoring, logging, etc) is in progress.

Thanks a lot to Matt Thomas for various useful comments and code review.
Aye by: board@

enable viadrm

Add upgt(4), Intersil PrismGT USB 802.11b/g adapter.

Sync with HEAD.

sync with head.

add more (commented-out) spdmem instances for HP xw-series workstations.

Welcome PAE inside i386 current.

This patch is inspired by work previously done by Jeremy Morse, ported by me
to -current, merged with the work previously done for port-xen, together with
additionals fixes and improvements.

PAE option is disabled by default in GENERIC (but will be enabled in ALL in
the next few days).

In quick, PAE switches the CPU to a mode where physical addresses become
36 bits (64 GiB). Virtual address space remains at 32 bits (4 GiB). To cope
with the increased size of the physical address, they are manipulated as
64 bits variables by kernel and MMU.

When supported by the CPU, it also allows the use of the NX/XD bit that
provides no-execution right enforcement on a per physical page basis.

Notes:

- reworked locore.S

- introduce cpu_load_pmap(), used to switch pmap for the curcpu. Due to the
different handling of pmap mappings with PAE vs !PAE, Xen vs native, details
are hidden within this function. This helps calling it from assembly,
as some features, like BIOS calls, switch to pmap_kernel before mapping
trampoline code in low memory.

- some changes in bioscall and kvm86_call, to reflect the above.

- the L3 is "pinned" per-CPU, and is only manipulated by a
reduced set of functions within pmap. To track the L3, I added two
elements to struct cpu_info, namely ci_l3_pdirpa (PA of the L3), and
ci_l3_pdir (the L3 VA). Rest of the code considers that it runs "just
like" a normal i386, except that the L2 is 4 pages long (PTP_LEVELS is
still 2).

- similar to the ci_pae_l3_pdir{,pa} variables, amd64's xen_current_user_pgd
becomes an element of cpu_info (slowly paving the way for MP world).

- bootinfo_source struct declaration is modified, to cope with paddr_t size
change with PAE (it is not correct to assume that bs_addr is a paddr_t when
compiled with PAE - it should remain 32 bits). bs_addrs is now a
void * array (in bootloader's code under i386/stand/, the bs_addrs
is a physaddr_t, which is an unsigned long).

- fixes in multiboot code (same reason as bootinfo): paddr_t size
change. I used Elf32_* types, use RELOC() where necessary, and move the
memcpy() functions out of the if/else if (I do not expect sym and str tables
to overlap with ELF).

- 64 bits atomic functions for pmap

- all pmap_pdirpa access are now done through the pmap_pdirpa macro. It
hides the L3/L2 stuff from PAE, as well as the pm_pdirpa change in
struct pmap (it now becomes a PDP_SIZE array, with or without PAE).

- manipulation of recursive mappings ( PDIR_SLOT_{,A}PTEs ) is done via
loops on PDP_SIZE.

See also http://mail-index.netbsd.org/port-i386/2010/07/17/msg002062.html

No objection raised on port-i386@ and port-xen@R for about a week.

XXX kvm(3) will be fixed in another patch to properly handle both PAE and !PAE
kernel dumps (VA => PA macros are slightly different, and need proper 64 bits
PA support in kvm_i386).

XXX Mixing PAE and !PAE modules may lead to unwanted/unexpected results. This
cannot be solved easily, and needs lots of thinking before being declared
safe (paddr_t/bus_addr_t size handling, PD/PT macros abstractions).

Almost entirely rework Intel Firmware Hub random number generator support.

This introduces fwhrng(4) which attaches via ichlpcib(4), replacing
the rnd(4) support in pchb(4).

Merge a driver for ACPI CPUs with basic support for processor power states,
also known as C-states. The code is modular and provides an easy way to add
the remaining functionality later (namely throttling and P-states).

Remarks:

  1.	Commented out in the GENERICs; more testing exposure is needed.

  2.	The C3-state is disabled for the time being because it turns off
	timers, among them the local APIC timer. This may not be universally
	true on all x86 processors; define ACPICPU_ENABLE_C3 to test.

  3.	The algorithm used to choose a power state may need tuning. When
	evaluating the appropriate state, the implementation uses the
	previous sleep time as an indicator. Additional hints would include
	for example the system load.

	Also bus master activity is evaluated when choosing a state. The
	usb(4) stack is notorious for such activity even when unused.
	Typically it must be disabled in order to reach the C3-state,
	but it may also prevent the use of C2.

  4.	While no extensive empirical measurements have been carried out, the
	power savings are somewhere between 1-2 W with C1 and C2, depending
	on the processor, firmware, and load. With C3 even up to 4 W can be
	saved.  The less something ticks, the more power is saved.

ok jmcneill@, joerg@, and discussed with various people.

sync with head

Fix build for MPLS import: add options MPLS, changed pseudo-device mpls
to pseudo-device ifmpls

add pseudo-device mpls - commented in GENERIC for now

enable the drm drivers; they've been tested for ages and have been
enabled on amd64 for some months now.  as requested in PR#42936.

sync with head

add btmagic(4) where other Bluetooth drivers are listed

enable IPFILTER_COMPAT in all kernels that have ipfilter already.
canonicalise several of the ipf option segments in various files
(this mostly means adding commented out IPFILTER_DEFAULT_BLOCK,
or adding commented or uncommented IPFILTER_LOG or IPFILTER_LOOKUP
option statements.)

i built about 20 of these kernels to check, but not all of them.

add alipm and its iic bus.

Sync with HEAD.

sync to netbsd-5

Remove unused count (invariably "4") from pseudo-device fss.

Move vald(4) to sys/dev/acpi. This is MI and should work also on amd64.

ok jmcneill@

XXX:    This is broken: it calls methods with absolute pathnames (almost
        guaranteed not to be portable across models), it accesses methods
        that are in the domain of other drivers, it walks the namespace on
        its own, it contains plenty of magic constants, it does not
        integrate with existing KPIs, etc. Summa summarum: this should be
        rewritten as a more generic toshiba_acpi(4).

Remove pad from GENERIC, add to MONOLITH, we have it as a module now.

Add WMI mappings for HP laptops. Requested by cegger@.
Thanks to apb@ and cegger@ for initial testing.

XXX: This conflicts with hpqlb(4). Someone with the suitable hardware needs
     to complete the list of hotkeys before -- and if -- this can replace
     hpqlb(4). For now, the driver was left uncommented in the GENERICs.

Add wmidell(4).

Added sdhc at cardbus support.

sync with head

Add etherip(4), commented out

add uhso(4)

remove aiboost(4) from GENERICs, since it cannot win in autoconf(9) over aibs(4);  ok pgoyette

Forgot to add smscmon here...

Mention splash need genfb or radeonfb

New wbsio(4) driver for Winbond Super I/O attachment of lm(4) on any port.

    http://mail-index.netbsd.org/tech-kern/2010/02/17/msg007338.html

Reviewed by <pgoyette>, <tech-kern>.

Add PPPOE_SERVER
 - disabled (commented out) in GENERIC,
 - enabled in ALL

Fix typo in TEMPer comment, spotted by Patrick Welche

Add TEMPer and TERMPerHUM driver

New aibs(4) driver for ASUSTeK AI Booster (ACPI ATK0110) hardware monitor
with limit support.

        http://thread.gmane.org/gmane.os.netbsd.devel.kernel/35654

Reviewed by <pgoyette>, <jruoho> and <tech-kern>.

Add flags to all instances of lm(4), add a reference to man page

Add acpismbus enries - commented out!

Remove ACPICA_PEDANTIC. Appears to be no longer in use.

remove accidentally committed bit.  pointed out by Patrick Welche

Redefine bpf linkage through an always present op vector, i.e.
#if NBPFILTER is no longer required in the client.  This change
doesn't yet add support for loading bpf as a module, since drivers
can register before bpf is attached.  However, callers of bpf can
now be modularized.

Dynamically loadable bpf could probably be done fairly easily with
coordination from the stub driver and the real driver by registering
attachments in the stub before the real driver is loaded and doing
a handoff.  ... and I'm not going to ponder the depths of unload
here.

Tested with i386/MONOLITHIC, modified MONOLITHIC without bpf and rump.

uhmodem(4) is superseded by u3g(4) and u3ginit(4).
Prepare for uhmodem(4) removal by not building it anymore.
This may fix PR kern/41174.

Add the u3ginit driver to all configs which have the u3g driver

Whitespace. Portions from Igor Sobrado in PR kern/22595.
Deploy <space><tab> where needed so columns don't teleport when
commenting or uncommenting things.

Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
Merged by yours truly as the set of configs has changed quite a bit since
the PR was filed in 2003, and I may have missed some stuff. These changes
should probably be merged into other arches' configs; I'm not going to do
that now though.

unifdef -D UGEN_BULK_RA_WB

Default behaviour unchanged, the feature must still be explicitly
enabled for a ugen fd.

Remove the portalfs kernel file system driver.  Replace mount_portal(8)
with a version based on puffs.  User functionality remains the same.

Add udl(4) and wsdisplay(4) as its child.

- more options<space><tab>
- capitalize Ethenet

- use options<space><tab>
- remove an extra whitespace

Sync with HEAD.

Pull up the following revisions, requested by sborrill in ticket #1114:
	share/man/man4/sdhc.4           1.1-1.2
	sys/dev/pci/sdhc_pci.c          1.1-1.3
	distrib/sets/lists/man/mi       patch
	share/man/man4/Makefile         patch
	sys/arch/amd64/conf/GENERIC     patch
	sys/arch/i386/conf/ALL          patch
	sys/arch/i386/conf/GENERIC      patch
	sys/dev/pci/files.pci           patch
	sys/dev/pci/pcidevs             patch
	sys/dev/pci/pcidevs.h           regen
	sys/dev/pci/pcidevs_data.h      regen

Add sdhc(4), a driver for SD controllers following the SD Host
Controller Standard Simplified Specification.

Pull up the following revisions(s) (requested by jmcneill in ticket #1045):
	distrib/sets/lists/man/mi:	revision 1.1160
	share/man/man4/Makefile:	revision 1.499
	share/man/man4/wb.4:		revision 1.1-1.2
	share/man/man4/ld.4:		revision 1.17
	sys/arch/i386/conf/ALL:		revision 1.215-1.216 + patch
	sys/arch/i386/conf/GENERIC:	revision 1.946-1.947 + patch
	sys/arch/amd64/conf/GENERIC:	revision 1.254-1.256 + patch
	sys/conf/files:			revision 1.958
	sys/dev/acpi/files.acpi:	revision 1.59
	sys/dev/acpi/wb_acpi.c:		revision 1.1
	sys/dev/ic/w83l518d.c:		revision 1.1
	sys/dev/ic/w83l518d_sdmmc.c:	revision 1.1
	sys/dev/ic/w83l518d_sdmmc.h:	revision 1.1
	sys/dev/ic/w83l518dreg.h:	revision 1.1
	sys/dev/ic/w83l518dvar.h.c:	revision 1.1

wb(4): Add a driver for Winbond W83L518D SD/MMC readers.

Pull up the following revisions(s) (requested by jmcneill in ticket #1061):
	sys/arch/x86/conf/files.x86:	revision 1.53
	sys/arch/x86/include/cpuvar.h:	revision 1.31
	sys/arch/x86/x86/identcpu.c:	revision 1.17
	sys/arch/x86/x86/viac7temp.c:	revision 1.1
	sys/arch/i386/conf/ALL:	revision 1.218
	sys/arch/i386/conf/GENERIC:	revision 1.949
Add support for VIA C7 temperature sensors (options VIA_C7TEMP) and enable
in i386 GENERIC kernel.

Enable viapcib

Add and enable options VIA_C7TEMP

PR# kern/42139: ACPI WMI: new driver

Import acpiwmi(4) from Jukka Ruohonen. From the PR:

Attached is a driver that implements ACPI WMI API:

http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx

The WMI is used to provide a generic interface for OEMs to use certain
platform/laptop-specific additions to the standard ACPI in a somewhat
portable way. These can be hotkeys for additional buttons, different event
handlers (wireless kill switch, lid switch, etc.), and so on. At least HP
and Acer use it by default nowadays.

The benefit of this interface would be portability. For an example, instead
of hpqlb(4) that works only with certain HP models, we could have a generic
HP WMI-driver that should work in theory across all HP laptops. On many new
laptops WMI may also be the only way to access laptop/manufacturer-specific
features.

Need sdmmc* at wb?

add and enable wb(4)

Pull up following revision(s) (requested by jmcneill in ticket #946):
	distrib/sets/lists/man/mi: revision 1.1155
	doc/CHANGES: revision 1.1285
	etc/MAKEDEV.tmpl: revision 1.128
	share/man/man4/Makefile: revision 1.498 via patch
	share/man/man4/hdaudio.4: revision 1.1-1.3
	share/man/man8/MAKEDEV.8: revision 1.36
	sys/arch/amd64/conf/GENERIC: revision 1.250-1.251
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.44-1.45
	sys/arch/i386/conf/ALL: revision 1.206-1.207
	sys/arch/i386/conf/GENERIC: revision 1.942-1.943
	sys/arch/i386/conf/XEN3_DOM0: patch
	sys/conf/majors: revision 1.47 via patch
	sys/dev/pci/hdaudio/files.hdaudio: revision 1.1-1.2
	sys/dev/pci/hdaudio/hdaudio.c: revision 1.1-1.4
	sys/dev/pci/hdaudio/hdaudio_afg.c: revisions 1.1-1.14
	sys/dev/pci/hdaudio/hdaudio_mixer.h: revisions 1.1-1.3
	sys/dev/pci/hdaudio/hdaudio_pci.c: revisions 1.1-1.2
	sys/dev/pci/hdaudio/hdaudioio.h: revisions 1.1-1.2
	sys/dev/pci/hdaudio/hdaudioreg.h: revisions 1.1-1.3
	sys/dev/pci/hdaudio/hdaudiovar.h: revisions 1.1-1.4
	sys/dev/pci/files.pci: revisions 1.319 and 1.322 via patch
hdaudio(4) is a standards-compliant driver for High Definition Audio.
It will replace azalia(4) after testing.
To use, comment out azalia in your kernel configuration and uncomment the
hdaudio and hdafg lines so it reads:
hdaudio*        at pci? dev ? function ?
hdafg*          at hdaudiobus?
You should also:
cd /dev
sh MAKEDEV audio

add toshide

sync with head

Pull up following revision(s) (requested by jmcneill in ticket #943):
	sys/arch/i386/conf/ALL: revision 1.186
	sys/arch/i386/conf/GENERIC: revision 1.921
add options PMS_ELANTECH_TOUCHPAD

Switch on hdaudio(4)

Refer to hdaudio as 'High Definition Audio', not
'Intel High Definition Audio' as many vendors implement the HD audio spec.

hdaudio(4) is a standards-compliant driver for Intel High Definition Audio.
It will replace azalia(4) after testing.

To use, comment out azalia in your kernel configuration and uncomment the
hdaudio and hdafg lines so it reads:

# Intel High Definition Audio
hdaudio*	at pci? dev ? function ?
hdafg*		at hdaudiobus?

You should also:
cd /dev
sh MAKEDEV audio

sync with head.

Add commented entries for keylock support.

Fix (commented out) gpioow usage.

Add commented out entries for gpiosim and gpio at gpiosim.

Support Marvell Hercules-I/II SATA Controllers.

Sync with HEAD.

Support siisata@cardbus.
  It tested on amd64 and i386 only.

Make POSIX message queues a kernel module.

Import read-only part of the NiLFS (v2) implementation for NetBSD. It has been
tested with a DEBUG+DIAGNOSTIC+LOCKDEBUG kernel. To summerise NiLFS, i'll
repeat my posting to tech-kern here:

NiLFS stands for New implementation of Logging File System; LFS done
right they claim :) It is at version 2 now and is being developed by NTT, the
Japanese telecom company and recently put into the linux source tree. See
http://www.nilfs.org. The on-disc format is not completely frozen and i expect
at least one minor revision to come in time.

The benefits of NiLFS are build-in fine-grained checkpointing, persistent
snapshots, multiple mounts and very large file and media support. Every
checkpoint can be transformed into a snapshot and v.v. It is said to perform
very well on flash media since it is not overwriting pieces apart from a
incidental update of the superblock, but that might change. It is accompanied
by a cleaner to clean up the segments and recover lost space.

My work is not a port of the linux code; its a new implementation. Porting the
code would be more work since its very linux oriented and never written to be
ported outside linux. The goal is to be fully interchangable. The code is non
intrusive to other parts of the kernel. It is also very light-weight.

The current state of the code is read-only access to both clean and dirty
NiLFS partitions. On mounting a dirty partition it rolls forward the log to
the last checkpoint. Full read-write support is however planned!

Just as the linux code, mount_nilfs allows for the `head' to be mounted
read/write and allows multiple read-only snapshots/checkpoint mounts next to
it.

By allowing the RW mount at a different snapshot for read-write it should be
possible eventually to revert back to a previous state; i.e. try to upgrade a
system and being able to revert to the exact state prior to the upgrade.

Compared to other FS's its pretty light-weight, suitable for embedded use and
on flash media. The read-only code is currently 17kb object code on
NetBSD/i386. I doubt the read-write code will surpass the 50 or 60. Compared
this to FFS being 156kb, UDF being 84 kb and NFS being 130kb. Run-time memory
usage is most likely not very different from other uses though maybe a bit
higher than FFS.

Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.

sync with head.

Pull up following revision(s) (requested by cegger in ticket #735):
	sys/dev/pci/if_age.c: revisions 1.1-1.28
	sys/dev/pci/if_agereg.h: revisions 1.1-1.2
	sys/dev/pci/if_ale.c: revisions 1.1-1.3
	sys/dev/pci/if_alereg.h: revisions 1.1-1.2
	sys/dev/pci/files.pci: revisions 1.310-1.313
	sys/dev/mii/atphy.c: revisions 1.1-1.5
	sys/dev/mii/files.mii: revision 1.42
	share/man/man4/age.4: revisions 1.1-1.3
	share/man/man4/ale.4: revisions 1.1-1.2
	share/man/man4/atphy.4: revisions 1.1-1.2
	share/man/man4/Makefile: revisions 1.486, 1.489
	distrib/sets/lists/man/mi: revisions 1.1118, 1.1132
	sys/arch/i386/conf/GENERIC: revisions 1.928, 1.933
	sys/arch/i386/conf/XEN2_DOM0: revisions 1.57, 1.60
	sys/arch/amd64/conf/GENERIC: revisions 1.239, 1.241
	sys/arch/amd64/conf/XEN3_DOM0: revisions 1.38, 1.42
Add the age(4) and ale(4) drivers for Attansic L1 and Atheros
AR8121/AR8113/AR8114 devices respectively.

Pull up following revision(s) (requested by jmcneill in ticket #260):
	sys/arch/i386/conf/ALL: revision 1.187
	sys/arch/i386/conf/GENERIC: revision 1.922
PR# port-i386/40284: add AMD Geode CS5536 audio driver; add gcscaudio(4)
to i386 GENERIC and ALL kernels

Sync with HEAD.

Added SD/MMC support from OpenBSD.
tested on i386, amd64 at current-users ML by pgoyette@.
tested on zaurus by myself.

add ale(4)

add commented out LOCKDEBUG

Unfuck compat some more

Remove -mtune, we'll let the compiler pick a good default (the current
default sucks).

Pullup the following revisions (requested by msaitoh in ticket #1284):
	distrib/sets/lists/base/mi		1.706-707,1.797
	distrib/sets/lists/man/mi		1.1006
	etc/mtree/NetBSD.dist			1.340
	share/man/man4/Makefile			1.432
	sys/arch/amd64/conf/GENERIC		1.149 via patch
	sys/arch/i386/conf/ALL			1.103
	sys/arch/i386/conf/GENERIC		1.832
	sys/arch/i386/conf/GENERIC_LAPTOP	1.237
	sys/arch/macppc/conf/GENERIC		1.257
	sys/arch/sparc64/conf/GENERIC		1.86
	sys/dev/usb/usbdevs			1.468,1.479-480 via patch
	sys/dev/usb/usbdevs.h			regen
	sys/dev/usb/usbdevs_data.h		regen
	sys/dev/microcode/Makefile		1.7
	sys/dev/usb/files.usb			patch
	share/man/man4/zyd.4			1.1 via patch
	sys/dev/microcode/zyd/Makefile		1.1-1.2
	sys/dev/microcode/zyd/build.c		1.1
	sys/dev/microcode/zyd/microcode.h	1.1
	sys/dev/microcode/zyd/zd1211-license	1.1
	sys/dev/microcode/zyd/zyd-zd1211	1.1
	sys/dev/microcode/zyd/zyd-zd1211b	1.1
	sys/dev/usb/if_zyd.c			patch
	sys/dev/usb/if_zydreg.h			1.1-1.2

Add ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g wireless network device support

Reactivate native compatibility in GENERIC.

add age(4) and atphy(4)

Sync with HEAD.

Apply patch (requested by pooka in ticket #453):
Add puffs and putter to amd64, i386, macppc, and sparc64 GENERIC kernels.

Fix typo in genfb line

Add and enable genfb(4), and remove vesafb(4) section.

move COMPAT_50 into MONOLITHIC, as pointed out by enami@.

Pull up following revision(s) (requested by ad in ticket #402):
	sys/arch/amd64/conf/GENERIC: revision 1.237
	sys/arch/i386/conf/GENERIC: revision 1.924
Enable BUFQ_PRIOCSCAN by default.

Enable BUFQ_PRIOCSCAN by default.

add COMPAT_50 to all the configs with COMPAT_40.

Sync with HEAD.

Sync with HEAD.

PR# port-i386/40284: add AMD Geode CS5536 audio driver; add gcscaudio(4)
to i386 GENERIC and ALL kernels

add options PMS_ELANTECH_TOUCHPAD

Update haad-dm branch to haad-dm-base2.

Don't compile PPP compressors in by default, they'll be auto-loaded.  This
saves an incredible 10k of text and data.

Remove softdep, pass 1. We are focused on improving journalling.

Proposed on tech-kern@.

Remove the following from i386 GENERIC since they are also provided by
modules. Shrinks the kernel by 1278kB. XXX Need to further investigate
situation with vcoda and nsmb.

- all file systems
- all exec formats
- all compat code
- POSIX AIO
- the NFS server
- accept filters

Apply patch (requested by bouyer in ticket #65):
Add i386-specific COMPAT_30_PTHREAD option (enabled where COMPAT_30
is enabled), which restore binary compatibility with netbsd-3 libpthread.

Comment out P1003_1B_SEMAPHORE. The ksem module will now be autoloaded from
the file system if POSIX semaphores are used.

Remove LKMs and switch to the module framework, pass 1.

Proposed on tech-kern@.

Reenable ichlpcib by default. This allows all modern ICH systems to use
the watchdog support out-of-the-box.

It is not clear, if the workaround for ancient revisions with broken
SpeedStep work, so if this breaks a report with PCI dump of the
southbridge is required to blacklist them.

Sync with HEAD.

Add u3g entries in kernels that have ugensa as well.

jme(4), a driver for JMicron Technologies JME250 Gigabit Ethernet and
JME260 Fast Ethernet PCI Express controllers.
Written with a lot of cut-n-paste from the FreeBSD jme(4) driver.
No support for jumbo ethernet frames yet (but should come soon).
Thanks to JMicron Technologies for providing me sample boards and
documentation for this work.

Sync with HEAD.

Move all platforms to new dbCool driver in preparation for removal of
chip-specific drivers

Add a note that SysV IPC parameters could be changed dynamically.

Sync with HEAD.

Remove esl(4)

Sync with HEAD.

Merge in changes between wrstuden-revivesa-base-2 and
wrstuden-revivesa-base-3.

Sync with wrstuden-revivesa-base-2.

Adding iwn(4) to GENERIC

Add uvideo(4)

Remove references to non-existant kernel option NO_TSC_TIME.
This fixes PR port-i386/39460 by Juan RP.

Enable video(4) and pseye(4)

Enable ipmi(4) by default in GENERIC and related kernels.

Add accept filters, ported from FreeBSD by Coyote Point Systems.  Add inetd
support for specifying an accept filter for a service (mostly as a usage
example, but it can be handy for other things).  Manual pages to follow
in a day or so.

OK core@.

Include VGA_POST by default in GENERIC and ALL on x86 now that the code
is conditional.

Add "options WAPBL" to standard GENERIC/INSTALL type configs.

Sync with HEAD.

Sync w/ -current. 34 merge conflicts to follow.

Sync with head.

sync with head.

Add cmos(4). This should probably be added to amd64 as well.

Initial commit of Wasabi System's WAPBL (Write Ahead Physical Block
Logging) journaling code.  Originally written by Darrin B. Jewell
while at Wasabi and updated to -current by Antti Kantee, Andy Doran,
Greg Oster and Simon Burge.

Still a number of issues - look in doc/BRANCHES for "simonb-wapbl"
for more info.

sync with head

Sync with netbsd-4.

Sync with HEAD.

Add pci* at elansc? bus ?.  Should fix Jasper's PR, port-i386/38800.

Add uberry.

Re-enable INCLUDE_CONFIG_FILE in the GENERIC kernel config files for
i386, amd64 and usermode - it is necessary for retrieving information
on kernel configuration for running kernels - cf config -x.

add siisata(4) -- SiI SteelVine SATA2

acpidalb(4): Driver for PNP0C32 Hotkeys aka "Direct Application Launch Buttons".
"awesome" jmcneill

sync with head.

sync with head.

PR kern/35296 option PIC_DELAY not use

The kernel is too large. Reduce size by commenting out eye candy options:

{ACPI,EISA,MII,PCI,USB,MCA}VERBOSE

Also remove INCLUDE_CONFIG_FILE, because it doesn't make sense in GENERIC.

- Give x86 BIOS boot the ability to load new style modules and pass them
  into the kernel. Based on a patch by jmcneill@, with many fixes and
  improvements by me.

- Put MEMORY_DISK_DYNAMIC and MODULAR into the GENERIC kernels, so that
  you can load miniroot.kmod from the boot blocks and boot into the
  installer!

hpqlb(4): driver for HP Quick Launch buttons - found on HP Pavilion Notebooks

For PR kern/38537:

- Make MULTIPROCESSOR mandatory on i386.

Installation changes:

- Update installation section of release notes to match reality.
- Rename INSTALL to INSTALL_FLOPPY, retire INSTALL_LARGE.
- Build INSTALL kernel from GENERIC, like on amd64.
- Update boot menu to allow disabling ACPI and/or SMP.
- Remove GENERIC.NOACPI from the installed kernel list.
- TODO: install default boot.cfg in etc.tgz.
- TODO: possibly enable PCI fixup stuff at runtime if ACPI is disabled.

Build changes:

- No longer build ALL, it's for verification, is slow to build and the
  build process is already crippled by the number of kernels built.
- No longer build GENERIC.NOACPI.

amdtemp(4): Driver for AMD CPU Temperature Sensors. Adopted from OpenBSD's kate(4).
Changes beyond OpenBSD's driver:
- Improved support for AMD K8
- Added support for AMD Barcelona, AMD Phenom and AMD Griffin
Tested on various single and multi-socket machines.
Review and OK xtreame

Pull up following revision(s) (requested by sborrill in ticket #1128):
	sys/dev/pci/if_lii.c: revisions 1.1, 1.3 via patch
	sys/arch/i386/conf/ALL: revision 1.161 via patch
	share/man/man4/lii.4: revision 1.1 via patch
	sys/dev/pci/files.pci: revision 1.303 via patch
	sys/dev/DEVNAMES: revision 1.238 via patch
	sys/arch/i386/conf/GENERIC: revision 1.885 via patch
	distrib/sets/lists/man/mi: revisions 1.1062, 1.1063 via patch
	sys/arch/i386/conf/XEN2_DOM0: revision 1.43 via patch
	share/man/man4/Makefile: revision 1.460 via patch
	sys/arch/i386/conf/INSTALL: revision 1.323 via patch
	sys/dev/pci/if_liireg.h: revision 1.1 via patch
Add a driver for the Atheros/Attansic L2 Fast-Ethernet chip found on a
series of hardware that includes Asus's famous EeePC.

Please don't leave a debug option in GENERIC.

Attach elansc at mainbus instead of at pci.

Add finsio(4) entry (commented out).

Sync with HEAD.

Enable asus(4)

Add and enable lii(4).

sync with head.

sync with HEAD

Back out previous, which obviously wasn't meant to get committed.

Split device_t and softc for ATA devices, as well as wd(4).  Other
cosmetic changes where appropriate.

sync with head.

Remove GENERIC.local from the repository

Make all the kernels that currently include their corresponding GENERIC.local
file use the cinclude directive instead of include.  This way config(1) will
not complain if the file cannot be found.

After doing this, remove the GENERIC.local files from the repository so that
the user will not see modified files during updates, and local changes to
them cannot end up in the repository by mistake.

Discussed in tech-kern@ earlier this month.  No strong objections.

Sync with HEAD.

sync with head.

Crank maxusers to 64.

Sync with HEAD.

enable 'uhmodem'

sync with head

Sync with HEAD

Remove options MATH_EMULATE.

Pull up following revision(s) (requested by christos in ticket #1037):
	sys/dev/pci/arcmsr.c: patch
	sys/dev/pci/arcmsrvar.h: patch
	sys/dev/pci/pcidevs: patch
	sys/dev/pci/files.pci: patch
	sys/arch/i386/conf/GENERIC: patch
	sys/arch/i386/conf/XEN2_DOM0: patch
	sys/arch/i386/conf/INSTALL_LARGE: patch
	sys/arch/amd64/conf/GENERIC: patch
	sys/arch/amd64/conf/INSTALL: patch
	share/man/man4/Makefile: patch
	share/man/man4/arcmsr.4: patch
	distrib/sets/lists/man/mi: patch

Add the Areca Technology Corporation SATA RAID controller driver, ported
from OpenBSD.

Sync with HEAD

Add gcscpcib(4).

sync with HEAD

Sync with HEAD

Fixed indentation, it should be

option<space><tab>
makeoption<space><tab>

Catch up to netbsd-4.0 release.

Remove white-space.

Sync with HEAD

Remove systrace. Ok core@.

Enable wedge autodiscovery and wedge support for GPT. Both MBR and BSD
disklabel support is *not* enabled, but documented.

Update itesio(4) comments.

Sync with HEAD.

Compile in by default (disabled) PaX ASLR for amd64 and i386.

Sync with head.

Add PHYSMEM_MAX_ADDR and PHYSMEM_MAX_SIZE options. This limit physical
memory based on overall size (useful for debugging to keep core dumps
small) or maximum address (when using devices with bus dma limits).
Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory
map and can therefore deal with fragmented memory.

Make SMP the default on i386. For the time being the noacpi kernel does
not have it enabled.

Add thinkpad at acpi

Add drvctl(4)

sync with head.

Merge jmcneill-pm branch.

Sync with HEAD.

Sync with HEAD.

Sync with head.

sync with head

arc(4) -> arcmsr(4)

Enable arc(4).

Sync with HEAD.

Sync with HEAD.

Sync with HEAD.

Add bcsp(4).

Sync with HEAD. amd64 Xen support needs testing.

Pull up following revision(s) (requested by jnemeth in ticket #998):
	sys/arch/amd64/conf/GENERIC: revision 1.176 (patch)
	sys/arch/i386/conf/GENERIC: revision 1.863
comment out com*/lpt* at acpi? as they cause these ports to move from
their traditional location and imminent changes in -current will cause
them to move back

Sync with HEAD

comment out com*/lpt* at acpi? as they cause these ports to move from
their traditional location and imminent changes in -current will cause
them to move back

Sync with HEAD.

Sync with HEAD.

Sync with HEAD

Update for it(4) -> itesio(4) rename.

sync with head.

Sync with HEAD.

- Remove I486_CPU, I586_CPU, I686_CPU options. They buy us nothing and
  clutter the code significantly.
- Remove pccons.

Sync with HEAD

Enable pad(4)

sync with HEAD

Sync with HEAD.

Remove System V semaphores and share memory options to set the limits:
SEMMNI, SEMMNS, SEMUME and SHMMAXPGS.

They can be tweaked via sysctl now. Ports that were setting values on
them weren't touched, I only removed the ones that were commented out.

Revert previous, thanks wikipedia :-)

Fix typo "iff" -> "if" reported by leot via freenode@irc.

Sync with HEAD.

options<space><tab>FOO

Sync with HEAD.

Enable "options INTEL_CORETEMP".

Sync with HEAD.

sync with head.

- Add amdpcib(4) commented out.
- Comment out piixpcib(4) until the multiple PRs are fixed, this driver
  has been broken for long time in some machines.

Merge the ppcoea-renovation branch to HEAD.

This branch was a major cleanup and rototill of many of the various OEA
cpu based PPC ports that focused on sharing as much code as possible
between the various ports to eliminate near-identical copies of files in
every tree.  Additionally there is a new PIC system that unifies the
interface to interrupt code for all different OEA ppc arches.  The work
for this branch was done by a variety of people, too long to list here.

TODO:
bebox still needs work to complete the transition to -renovation.
ofppc still needs a bunch of work, which I will be looking at.
ev64260 still needs to be renovated
amigappc was not attempted.

NOTES:
pmppc was removed as an arch, and moved to a evbppc target.

Pull up following revisions via patch (requested by bouyer in ticket #1838):
	distrib/sets/lists/man/mi: revision 1.997
	sbin/bioctl/strtonum.c: revision 1.1
	sys/dev/Makefile: revision 1.25
	sys/arch/amd64/conf/GENERIC: revision 1.139
	sbin/bioctl/strtonum.h: revision 1.1
	sys/dev/bio.c: revision 1.1
	sbin/bioctl/bioctl.c: revision 1.1
	share/man/man4/bio.4: revision 1.1
	sbin/bioctl/bioctl.8: revision 1.1
	sys/sys/envsys.h: revision 1.11
	sbin/bioctl/bioctl.8: revision 1.3
	sbin/bioctl/bioctl.8: revision 1.4
	sys/arch/i386/conf/XEN2_DOM0: revision 1.25
	distrib/sets/lists/base/mi: revision 1.704
	sys/conf/majors: revision 1.34
	share/man/man4/Makefile: revision 1.426
	etc/MAKEDEV.tmpl: revision 1.86
	sys/arch/i386/conf/GENERIC: revision 1.825
	distrib/sets/lists/comp/mi: revision 1.1022
	sys/conf/files: revision 1.839
	usr.sbin/envstat/envstat.c: revision 1.24
	sbin/Makefile: revision 1.105
	sys/dev/ic/mfi.c: revision 1.4
	sys/dev/biovar.h: revision 1.1
	sys/dev/ic/mfivar.h: revision 1.4
	sbin/bioctl/Makefile: revision 1.1
Fix typo.
Add bio(4) and associated bioctl(8) from OpenBSD, a driver control block
device controllers, and more specifically raid controllers.
Add a new sensor type, ENVSYS_DRIVE, to report drive status. From OpenBSD.
Add bio and sysmon support to mfi(4). This allow userland to query
status for drives and logical volumes attached to a mfi(4) controller. While
there fix some debug printfs in mfi so they compile.
Add bio(4) to amd64 and i386 GENERIC.
Add bio(4) and associated bioctl(8) from OpenBSD, a driver control block
device controllers, and more specifically raid controllers.
Add a new sensor type, ENVSYS_DRIVE, to report drive status. From OpenBSD.
Add bio and sysmon support to mfi(4). This allow userland to query
status for drives and logical volumes attached to a mfi(4) controller. While
there fix some debug printfs in mfi so they compile.
Add bio(4) to amd64 and i386 GENERIC.
Fix Dd argument (use full month names).
Use more markup.
Comment out references to safte(4) and softraid(4), which don't exist in
NetBSD.
Remove trailing whitespace.
Use macros instead of characters for HTML output (replace ">", "<"
with \*[Gt], \*[Lt]).
Sort sections.
Create /dev/bio

Sync with head.

sync with head.

Sync with HEAD

Rewrite the ACPI Embedded Controller handler to use pure event driven
operation. On suspend a special flag is set to force explicit polling
as AcpiLeaveSleep accesses the interrupt before GPE handling is
restored. The driver uses a kernel thread to handle GPE queries and
mutex/condvar for synchronisation.

Split the ACPI EC into two drivers, one that is attached directly by
acpi.c for the ECDT driven attachment and the normal acpiec for late
attachment. Share almost all code between this two drivers. If acpiecdt
is attached, acpiec is returning. This was discussed with cube@ and is
the best solution so far.

Sync with HEAD.

Catch up on netbsd-4 as of a few days ago.

Pull up following revision(s) (requested by mlelstv in ticket #895):
	sys/dev/usb/uslsa.c: revision 1.1
	sys/dev/usb/uslsa.c: revision 1.2
	sys/dev/usb/uslsa.c: revision 1.3
	sys/dev/usb/usbdevs: revision 1.466 (via patch)
	share/man/man4/uslsa.4: revision 1.1
	share/man/man4/Makefile: revision 1.429
	sys/arch/i386/conf/GENERIC: revision 1.828
	distrib/sets/lists/man/mi: revision 1.1002
	sys/dev/usb/files.usb: revision 1.77
	sys/arch/i386/conf/ALL: revision 1.99

From PR kern/33496 - add uslsa(4), a CP210x USB-RS232 ucom driver.

Remove two \t at the end of DDB_VERBOSE_HELP, caught by Patrick Welche.

options<tab><space>OPTION for previous.

Add a new option DDB_VERBOSE_HELP that adds online help to ddb.
From Adam Hamsik.
Minor modifications by me, all bugs are probably mine.

New aps(4) driver for IBM Thinkpad Active Protection System.
Exports some sensors through the envsys(4) framework available
in some Thinkpad laptops.

Ported by Pierre Pronchery from OpenBSD, via PR port-i386/36852.

Tweaks, LKM and misc improvements by me. Added into i386/GENERIC
commented out.

Sync with HEAD.

Add some options and drivers only found in GENERIC_LAPTOP:
- add PMS_SYNAPTICS_TOUCHPAD
- add njata at cardbus
- add re at cardbus
- add stuirda at uhub
- add ugensa at uhub

Fixed indentation (it should be <keyword><space><tab><name><tab><comment>).

Enable CGD in GENERIC for amd64 and i386.

Enable cgd by default on amd64 and i386.

add support for WinChipHead CH341/340 USB-Serial bridge.

Sync with HEAD.

sync with head.

Sync with HEAD.

Sync w/ NetBSD-4-RC_1

Pull up following revision(s) (requested by bouyer in ticket #678):
	distrib/sets/lists/man/mi: revision 1.1001
	doc/CHANGES: revision 1.853 via patch
	share/man/man4/Makefile: revision 1.428
	share/man/man4/jmide.4: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.143
	sys/arch/amd64/conf/INSTALL: revision 1.69
	sys/arch/i386/conf/GENERIC: revision 1.827
	sys/arch/i386/conf/INSTALL_LARGE: revision 1.2 via patch
	sys/arch/i386/conf/XEN2_DOM0: revision 1.26
	sys/conf/files: revision 1.844 via patch
	sys/dev/ic/ahcisata_core.c: revision 1.1 via patch
	sys/dev/ic/ahcisata_core.c: revision 1.3
	sys/dev/ic/ahcisatareg.h: revision 1.1
	sys/dev/ic/ahcisatavar.h: revision 1.1
	sys/dev/pci/ahcisata.c: delete
	sys/dev/pci/ahcisatareg.h: delete
	sys/dev/pci/ahcisata_pci.c: revision 1.1
	sys/dev/pci/files.pci: revision 1.287-1.288
	sys/dev/pci/jmide.c: revision 1.1-1.2
	sys/dev/pci/jmide_reg.h: revision 1.1
	sys/dev/pci/pcidevs: revision 1.878
Add JMicron Technology vendor ID, and their current PCIe SATA/PATA
controllers.

Split the ahcisata driver in pci front-end and bus-independant back-end.
add jmide(4), a driver for the JMicron Technology JMB36x PCIe to SATA II/PATA
controllers. These controllers can be found on add-on PCIe cards, or
on some motherboards to provide the PATA connectivity (e.g. some intel
ICH8-based motherboards).
Thanks to JMicron Technology for providing me documentation and
different sample boards for this work.

Move mapping of AHCI register so that jmide knows if it fails, and avoids
calling ahci_intr() (which would cause a panic).
Try to use the pciide function for SATA drives if attaching ahci fails (this
doesn't seems to work though, it may be BIOS dependant).
Thanks to Gary Duzan for testing multiple pacthes.

We're not ready to handle ATAPI yet so just claim there's no drive to the
upper layer. This should work around a NULL pointer dereference when
an ATAPI device is detected on a AHCI device.

Pull up following (requested by xtraeme ticket #846):

Import i386/gcscide(4). A driver for the IDE Controller of the
AMD CS5535 Companion device found in the decTOP.

gcscide0 at pci0 dev 15 function 2
gcscide0: National Semiconductor/AMD CS5535 IDE Controller (rev. 0x00)

Supports Ultra DMA mode 4, Pio Mode 4 and MDMA mode 2.

"Go for it" jmcneill@.

Pull up following revision(s) (requested by adrianp in ticket #1826):
	sys/arch/hp300/conf/GENERIC: revision 1.141 via patch
	sys/arch/amd64/conf/GENERIC: revision 1.154 via patch
	sys/arch/cats/conf/GENERIC: revision 1.116 via patch
	sys/arch/arc/conf/GENERIC: revision 1.148 via patch
	sys/arch/acorn32/conf/GENERIC: revision 1.80 via patch
	sys/arch/sparc/conf/GENERIC: revision 1.200 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.88 via patch
	sys/arch/atari/conf/GENERIC.in: revision 1.68 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.248 via patch
	sys/arch/i386/conf/GENERIC.MPACPI: patch
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66 via patch
	sys/arch/i386/conf/GENERIC: revision 1.840 via patch
	sys/arch/amiga/conf/GENERIC.in: revision 1.61 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68 via patch
	sys/arch/mac68k/conf/GENERIC: revision 1.182 via patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Pull up following revision(s) (requested by adrianp in ticket #1826):
	sys/arch/hp300/conf/GENERIC: revision 1.141 via patch
	sys/arch/amd64/conf/GENERIC: revision 1.154 via patch
	sys/arch/cats/conf/GENERIC: revision 1.116 via patch
	sys/arch/arc/conf/GENERIC: revision 1.148 via patch
	sys/arch/acorn32/conf/GENERIC: revision 1.80 via patch
	sys/arch/sparc/conf/GENERIC: revision 1.200 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.88 via patch
	sys/arch/atari/conf/GENERIC.in: revision 1.68 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.248 via patch
	sys/arch/i386/conf/GENERIC.MPACPI: patch
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66 via patch
	sys/arch/i386/conf/GENERIC: revision 1.840 via patch
	sys/arch/amiga/conf/GENERIC.in: revision 1.61 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68 via patch
	sys/arch/mac68k/conf/GENERIC: revision 1.182 via patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Pull up following revision(s) (requested by adrianp in ticket #1826):
	sys/arch/hp300/conf/GENERIC: revision 1.141 via patch
	sys/arch/amd64/conf/GENERIC: revision 1.154 via patch
	sys/arch/cats/conf/GENERIC: revision 1.116 via patch
	sys/arch/arc/conf/GENERIC: revision 1.148 via patch
	sys/arch/acorn32/conf/GENERIC: revision 1.80 via patch
	sys/arch/sparc/conf/GENERIC: revision 1.200 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.88 via patch
	sys/arch/atari/conf/GENERIC.in: revision 1.68 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.248 via patch
	sys/arch/i386/conf/GENERIC.MPACPI: patch
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66 via patch
	sys/arch/i386/conf/GENERIC: revision 1.840 via patch
	sys/arch/amiga/conf/GENERIC.in: revision 1.61 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68 via patch
	sys/arch/mac68k/conf/GENERIC: revision 1.182 via patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Modify ichlpcib description, it has timecounter support too.

Pull up following revision(s) (requested by adrianp in ticket #820):
	sys/arch/hp300/conf/GENERIC: revision 1.141
	sys/arch/alpha/conf/GENERIC: revision 1.315
	sys/arch/amd64/conf/GENERIC: revision 1.154
	sys/arch/cats/conf/GENERIC: revision 1.116
	sys/arch/arc/conf/GENERIC: revision 1.148
	sys/arch/acorn32/conf/GENERIC: revision 1.80
	sys/arch/sparc/conf/GENERIC: revision 1.200
	sys/arch/sparc64/conf/GENERIC: revision 1.88
	sys/arch/atari/conf/GENERIC.in: revision 1.68
	sys/arch/amiga/conf/GENERIC: revision 1.248
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66
	sys/arch/i386/conf/GENERIC: revision 1.840
	sys/arch/amiga/conf/GENERIC.in: revision 1.61
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68
	sys/arch/mac68k/conf/GENERIC: revision 1.182
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Add slhci at pcmcia.
 And reorder.

Sync with HEAD.

Add btbc(4).

Enable spdmem(4) in ALL configuration. Add commented out entries to GENERIC

Sync with HEAD.

Pull up following revision(s) (requested by adrianp in ticket #11356):
	sys/arch/acorn32/conf/GENERIC                   1.80 via patch
	sys/arch/amd64/conf/GENERIC                     1.154 via patch
	sys/arch/amiga/conf/GENERIC.in                  1.61 via patch
	sys/arch/arc/conf/GENERIC                       1.148 via patch
	sys/arch/atari/conf/GENERIC.in                  1.68 via patch
	sys/arch/cats/conf/GENERIC                      1.116 via patch
	sys/arch/hp300/conf/GENERIC                     1.141 via patch
	sys/arch/hp700/conf/GENERIC                     patch
	sys/arch/i386/conf/GENERIC                      1.840 via patch
	sys/arch/i386/conf/GENERIC_LAPTOP               1.239 via patch
	sys/arch/i386/conf/GENERIC.MPACPI               patch
	sys/arch/mac68k/conf/GENERIC                    1.182 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x            1.68 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x            1.66 via patch
	sys/arch/sparc/conf/GENERIC                     1.200 via patch
	sys/arch/sparc64/conf/GENERIC32                 patch
	sys/arch/xen/conf/GENERIC                       patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Pull up following revision(s) (requested by adrianp in ticket #11356):
	sys/arch/acorn32/conf/GENERIC                   1.80 via patch
	sys/arch/amd64/conf/GENERIC                     1.154 via patch
	sys/arch/amiga/conf/GENERIC.in                  1.61 via patch
	sys/arch/arc/conf/GENERIC                       1.148 via patch
	sys/arch/atari/conf/GENERIC.in                  1.68 via patch
	sys/arch/cats/conf/GENERIC                      1.116 via patch
	sys/arch/hp300/conf/GENERIC                     1.141 via patch
	sys/arch/hp700/conf/GENERIC                     patch
	sys/arch/i386/conf/GENERIC                      1.840 via patch
	sys/arch/i386/conf/GENERIC_LAPTOP               1.239 via patch
	sys/arch/i386/conf/GENERIC.MPACPI               patch
	sys/arch/mac68k/conf/GENERIC                    1.182 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x            1.68 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x            1.66 via patch
	sys/arch/sparc/conf/GENERIC                     1.200 via patch
	sys/arch/sparc64/conf/GENERIC32                 patch
	sys/arch/xen/conf/GENERIC                       patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Pull up following revision(s) (requested by adrianp in ticket #11356):
	sys/arch/acorn32/conf/GENERIC                   1.80 via patch
	sys/arch/amd64/conf/GENERIC                     1.154 via patch
	sys/arch/amiga/conf/GENERIC.in                  1.61 via patch
	sys/arch/arc/conf/GENERIC                       1.148 via patch
	sys/arch/atari/conf/GENERIC.in                  1.68 via patch
	sys/arch/cats/conf/GENERIC                      1.116 via patch
	sys/arch/hp300/conf/GENERIC                     1.141 via patch
	sys/arch/hp700/conf/GENERIC                     patch
	sys/arch/i386/conf/GENERIC                      1.840 via patch
	sys/arch/i386/conf/GENERIC_LAPTOP               1.239 via patch
	sys/arch/i386/conf/GENERIC.MPACPI               patch
	sys/arch/mac68k/conf/GENERIC                    1.182 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x            1.68 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x            1.66 via patch
	sys/arch/sparc/conf/GENERIC                     1.200 via patch
	sys/arch/sparc64/conf/GENERIC32                 patch
	sys/arch/xen/conf/GENERIC                       patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Sync with HEAD.

Sync with HEAD.

Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

Add ichsmb(4).

Sync with head.

Alphabetical reorder.

Sync with head.

Add nfsmb(4).

Enable gcscehci(4)

Add gcscide(4).

Sync with HEAD.

Pull up following revision(s) (requested by dyoung in ticket #738):
	sys/arch/i386/conf/GENERIC: revision 1.800
Add rtw at pci to the GENERIC kernel.

Pull up following revision(s) (requested by riz in ticket #734):
	sys/arch/i386/pci/glxsb.c: revision 1.1
	sys/arch/i386/conf/GENERIC: revision 1.833
	share/man/man4/man4.i386/glxsb.4: revision 1.1
	sys/arch/i386/conf/ALL: revision 1.104
	share/man/man4/man4.i386/Makefile: revision 1.66
	sys/arch/i386/conf/files.i386: revision 1.309
	distrib/sets/lists/man/mi: revision 1.1007
Import driver for the AMD Geode LX AES Security Block, from OpenBSD. The
glxsb(4) driver provides random numbers and AES acceleration.
Add man page for AMD Geode LX AES Security Block driver.
Enable glxsb(4)

-options I2OVERBOSE.

Enable glxsb(4)

Sync with head.

Add zyd(4).

Pull up following revision(s) (requested by martin in ticket #699):
	sys/arch/hpcmips/conf/GENERIC: revision 1.196
	sys/arch/hp700/conf/GENERIC: revision 1.74
	sys/arch/i386/conf/GENERIC: revision 1.831
	sys/arch/next68k/conf/GENERIC: revision 1.108
	sys/arch/alpha/conf/GENERIC: revision 1.313
	sys/arch/arc/conf/GENERIC: revision 1.146
	sys/arch/cats/conf/GENERIC: revision 1.115
	sys/arch/ews4800mips/conf/GENERIC: revision 1.18
	sys/arch/landisk/conf/GENERIC: revision 1.8 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.85
	sys/arch/pmax/conf/GENERIC: revision 1.152
	sys/arch/iyonix/conf/GENERIC: revision 1.38 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.245
	sys/arch/vax/conf/GENERIC: revision 1.157
	sys/arch/prep/conf/GENERIC: revision 1.135
	sys/arch/pc532/conf/GENERIC: revision 1.70
	sys/arch/sbmips/conf/GENERIC: revision 1.61
	sys/arch/mipsco/conf/GENERIC: revision 1.65
	sys/arch/cobalt/conf/GENERIC: revision 1.108
	sys/arch/ofppc/conf/GENERIC: revision 1.98
	sys/arch/amd64/conf/GENERIC: revision 1.148
	sys/arch/acorn26/conf/GENERIC: revision 1.50
	sys/arch/dreamcast/conf/GENERIC: revision 1.78
	sys/arch/mac68k/conf/GENERIC: revision 1.181
	sys/arch/hp300/conf/GENERIC: revision 1.139
	sys/arch/mmeye/conf/GENERIC: revision 1.88
	sys/arch/news68k/conf/GENERIC: revision 1.88
	sys/arch/mvme68k/conf/GENERIC: revision 1.71
	sys/arch/acorn32/conf/GENERIC: revision 1.79
	sys/arch/sparc/conf/GENERIC: revision 1.199
	sys/arch/luna68k/conf/GENERIC: revision 1.78
	sys/arch/bebox/conf/GENERIC: revision 1.105
	sys/arch/macppc/conf/GENERIC: revision 1.256 via patch
	sys/arch/x68k/conf/GENERIC: revision 1.134
	sys/arch/sun3/conf/GENERIC: revision 1.138
	sys/arch/newsmips/conf/GENERIC: revision 1.98
Add pseudo-device agr to all GENERIC kernels where it might make sense
(commented out in some).