Pull up following revision(s) (requested by skrll in ticket #1094):
sys/dev/usb/if_urndis.c: revision 1.7
PR/48963: kmem_free size mismatch causes panic when attaching urndis(4).
Fix the size passed in kmem_free in the urndis_ctrl_{query,set} functions

(msaitoh)

suppress possibly used uninitialized warning on sgimips

from martin@

(rtr)

Pull up following revision(s) (requested by taca in ticket #1093):
doc/3RDPARTY: revision 1.1126
etc/namedb/root.cache: revision 1.18
Update root.cache to 2014060201.
Now B.ROOT-SERVERS.NET and C.ROOT-SERVERS.NET has an AAAA record.
Update root.cache entry.

(msaitoh)

Pull up following revision(s) (requested by taca in ticket #1093):
doc/3RDPARTY: revision 1.1126
etc/namedb/root.cache: revision 1.18
Update root.cache to 2014060201.
Now B.ROOT-SERVERS.NET and C.ROOT-SERVERS.NET has an AAAA record.
Update root.cache entry.

(msaitoh)

Pull up following revision(s) (requested by taca in ticket #1093):
doc/3RDPARTY: revision 1.1126
etc/namedb/root.cache: revision 1.18
Update root.cache to 2014060201.
Now B.ROOT-SERVERS.NET and C.ROOT-SERVERS.NET has an AAAA record.
Update root.cache entry.

(msaitoh)

Add one more TODO:
- We should check XXX'ed comments.

(msaitoh)

Pull up following revision(s) (requested by abs in ticket #1091):
sys/arch/sun3/conf/DISKLESS: revision 1.69
Enable ie0 in DISKLESS for sun3/110

(msaitoh)

Pull up following revision(s) (requested by mlelstv in ticket #1089):
distrib/sets/lists/comp/md.amd64 via patch
Fix build failure for MKDEBUG+MKCRYPTO_RC5 on amd64.

(msaitoh)

Pull up following revision(s) (requested by skrll in ticket #1087):
external/bsd/cron/dist/entry.c: revision 1.5
PR/48944: cron ignores '?' (question mark) time field
Fix the obvious merge botch.

(msaitoh)

Use NULL instead of 0 for pointers

(ozaki-r)

for i386 and amd64, append vesa to the end of the possible video driver
list. makes "startx" without a config file work on systems where there is
a known native driver, but it is not installed (like "vboxvideo").

(jmcneill)

simplify wpi_rx_intr rbuf handling and add some more bus_dmamap_sync; fixes stalls when downloading large files for me

(jmcneill)

remove KASSERT(nam != NULL) from ddp_send() the following code makes
the validity of it questionable.  we'll investigate later whether it
can be put back and the code simplified.

(rtr)

provide a setmode callback for genfb; with this change, vt switching in and out of X works

(jmcneill)

radeon_fence_signaled needs to take the fence lock.

(riastradh)

Consistently define WARN in a way that passes format string checks, i.e.
always uses the same number of arguments as given in the format string.

(joerg)

Update tzdata2netbsd for tzdata2014f.

(apb)

zoneinfo: Import tzdata2014f. [apb 20140806]

(apb)

tzcode2014f/tzdata2014f has been released.  We have updated tzdata.

(apb)

New files that appeared in tzdata2014f, plus the
leapseconds file that has existed for a long time
but was not installed before today.

(apb)

Merge tzdata2014f.

The following new time zones are added:
    Asia/Chita Asia/Srednekolymsk
The following new file is installed:
    zone1970.tab
The following existing file is now installed, whereas we previously
did not install it:
    leapseconds

(apb)

Use cmpwi.

(joerg)

Wrap CTFCONVERT invocations in ${defined(CTFCONVERT):? ... :}
so it performs the test at the time the rule is invoked.  We can't
use a ".if defined" test because that would be tested at the time the
sys.mk file is parsed, which may be before CTFCONVERT has been set by
bsd.own.mk.

Remove the now-unnecessary assignment "CTFCONVERT ?= : ctfconvert",
and the similar assignment to CTFMERGE.  Now the build logs are not
cluttered by many unnecessary invocations of the ": ctfconvert ..."

(apb)

Use cmpwi/cmpw

(joerg)

Use cmpwi.

(joerg)

Whack some nouveau moles.

(riastradh)

Bump all image sizes slightly again

(martin)

Remove duplicated initializer.

(joerg)

Remove unused variable.

(isaki)

Add rounddown_pow_of_two.

(riastradh)

Bump ramdisksize even slightly more

(martin)

Give non-standard main in a freestanding environment a prototype.

(joerg)

Add files.nouveau to files.drmkms_pci.

(riastradh)

Fix format string and unused variables.

(riastradh)

Fix sense of drm prime conditional.

(riastradh)

More Linux goo.

(riastradh)

Add Linux printk cruft.

(riastradh)

Add bogus Linux platform_device stub.

(riastradh)

Add Linux PCI DMA stuff and NVIDIA vendor.

(riastradh)

Add Linux lockdep cruft.

(riastradh)

Add Linux i2c stubs.

(riastradh)

Omit needless firmware handle from Linux struct firmware.

(riastradh)

Add Linux DMA_BIT_MASK.

(riastradh)

Add Linux __ffs64.

(riastradh)

Include moduleparam and export in <linux/module.h> as users expect.

(riastradh)

Add local support files for nouveau.

(riastradh)

Snapshot of nouveau.  Doesn't build yet, but progress.

(riastradh)

merge re-imported nouveau

(riastradh)

Tweak fence locking again with a broader view of the code paths.

(riastradh)

Make it a warning, otherwise the missing noreturn will fail the build.

(joerg)

When searching for a default MACHINE_ARCH for a given MACHINE,
don't break out of the loop too early.

(apb)

Do not install message catalogs

(martin)

Punt - backout sysinst message catlogs

(martin)

To make pax use ${TOOL_GZIP}, we need to pass "--use-compress-program
${TOOL_GZIP}" on the command line, and refrain from passing "-z".  If
passed "-z", pax will use plain "gzip", ignoring --use-compress-program.

(apb)

Introduce and use GZIP_FLAGS variable.

The previous use of GZIP="-9 ${GZIP_N_FLAG}" happened to work, but
the new use of GZIP=${GZIP_FLAGS:Q} is safer.

For consistency, also use GZIP_FLAGS elesehere in this file.

(apb)

Introduce and use GZIP_FLAGS variable, to fix a quoting error
in the way we tried to use GZIP="-9 ${GZIP_N_FLAG}".
For consistency, also use GZIP_FLAGS elesehere in this file.

(apb)

Remove a few menu entries if raid/lvm/cgd/gpt are not available.

(martin)

Make sysinst use the catalog files installed in /usr/share/sysinst (if
available), fall back to . if not, or use build-in english otherwise.

(martin)

Sigh - move sysinst catalog files (which differ per arch, ouch!)
to md lists.

(martin)

Don't check SWSM_SMBI bit if WM_F_LOCK_SWSM isn't set. Fix a problem when
using vmware with e1000"e". With e1000e which is regarded as 82574L,
wm_gmii_init() fails with "could not acquire SWSM SMBI" message without
this change. This problem doesn't occur with real 82574L card.

TODO:
- Change the function name. It's difficult to understand. The name was
  from old Intel original e1000 driver.
- Read Intel original driver again and check ALL location where semaphore is
  used.

(msaitoh)

bus_dmamap_sync for rx descriptors too, derived from openbsd driver

(jmcneill)

Use surface_width/height, not fb_width/height.

This matches the sizes the upstream code uses.

(riastradh)

Tweak heuristic for placing __KERNEL_RCSID in nouveau2netbsd.

(riastradh)

Add sysinst message files

(martin)

Install language files

(martin)

Add a directory for sysinst language files

(martin)

Add some TODOs in comment.

(msaitoh)

Update all ramdisk sizes

(martin)

Don't use non-literal strings as format strings.
XXX Switch to strlcpy.

(joerg)

Add kludgey nouveau2netbsd script in preparation for re-import.

(riastradh)

Sprinkle bus_dmamap_sync to make this work on my Thinkpad T61 (amd64)
with 4GB RAM.

(jmcneill)

The argument of stwu is displacement(register), but GAS translates the
%rX mnemonic very early into plain X, so it seemingly accepts
%register(displacement) as well. Be consistent in the formatting for
human consumption.

(joerg)

Adapt to bigger ramdisk image

(martin)

Bump ramdisk size

(martin)

Adapt to grown ramdisk image size

(martin)

Typo in comment

(apb)

Ue ${GZIP_N_FLAG} instead of -n when setting GZIPFLAGS or GZIP_FLAGS.
This will allow -nT instead of just -n to be passed to pigz.

(apb)

Pass GZIP="-9 ${GZIP_N_FLAG}" instead of GZIP=-9n
in the environmentto commands that invoke ${TOOL_GZIP}.
This will allow them to use -nT instead of just -n with pigz.

(apb)

Use ${TOOL_GZIP_N} instead of ${TOOL_GZIP} -n, and similarly
use ${TOOL_GZIP_N} -9 instead of ${TOOL_GZIP} -9n, etc.

This will pass -nT instead of just -n if the gzip program is
actually pigz.

(apb)

Provide and document GZIP_N_FLAG and TOOL_GZIP_N.
These may be used to pass "-nT" instead of just "-n"
when the gzip program is actually pigz.

(apb)

Rework minherit(2) man page into a table.

XXX Do we not guarantee page-granularity inheritance?  Cursory glance
at uvm suggests we do -- can we nix the caveats about regions vs
pages?

(riastradh)

Bump ramdisk size

(martin)

whitespace

(rtr)

Support a 'switch' command.
It displays/modifies some SRAM parameters on X680x0, like as
memswitch(1) or Human68k's SWITCH.X .
It makes easy to change the boot devices or correct the inconsistency
of SRAM/real memory size.

sample usage:
> switch show        .. show all supported parameters
> switch boot=std    .. set boot order to 'STD'
> switch memory=12    .. set memory size to 12MB

(isaki)

Add a few missing files

(martin)

Remove #ifdef DIAGNOSTIC around sc from the root interrupt abort methods
now it's always used.

(skrll)

actually use the passed in struct lwp *l instead of curlwp in unp_connect()

(rtr)

Change adosfs from hashlist to vcache.
- point ap->block to real file header block for hard links.

(hannken)

Avoid comparision between array and NULL

(martin)

Prevent the root hub sending updates once the root interrupt abort is
called.

(skrll)

Fix overflow check. From Kamil Rytarowski.

(christos)

split PRU_SEND function out of pr_generic() usrreq switches and put into
separate functions

  xxx_send(struct socket *, struct mbuf *, struct mbuf *,
      struct mbuf *, struct lwp *)

  - always KASSERT(solocked(so)) even if not implemented

  - replace calls to pr_generic() with req = PRU_SEND with calls to
    pr_send()

rename existing functions that operate on PCB for consistency (and to
free up their names for xxx_send() PRUs

  - l2cap_send() -> l2cap_send_pcb()
  - sco_send() -> sco_send_pcb()
  - rfcomm_send() -> rfcomm_send_pcb()

patch reviewed by rmind

(rtr)

Remove "tags=nodiff" from /var/log/authlog as suggested by uebayasi@;
part of PR 49031.

(dholland)

get_tcppcb() is nearly always called upon entry to usrreqs so
KASSERT(solocked(so)) inside it and remove the redundant KASSERT
everywhere we are using tcp_getpcb()

(rtr)

Whitespace.

(skrll)

Simplify the freeing of the interrupt pipe transfer.  Inspired by OpenBSD.

(skrll)

Don't set __NO_STRICT_ALIGNMENT as armv[67] ldm/stm have alignment
restrictions.

PR/49020: Writing to tap device may cause panic on RPI

Discussed with matt@

(skrll)

revert the removal of struct lwp * parameter from bind, listen and connect
user requests.

this should resolve the issue relating to nfs client hangs presented
recently by wiz on current-users@

(rtr)

In the BCM5703, the DMA read watermark should be set to less than
or equal to the maximum memory read byte count of the PCI-X command
register. Same as FreeBSD r204978 and Linux tg3 driver.

(msaitoh)

mpc85xx_extirq_names is not used for the MPC8548 branch.

(joerg)

Assume bitops are meant here.

(joerg)

use proper address, ok spz@.

(szptvlfn)

Synchronise several shell_quote implementations, and:
* Elide some unnecessary pairs of quotation marks, to improve readability.
  For example, shell_quote "''" is now \'\' instead of ''\'''\'''.
* Don't add quotes around words that contain only safe characters,
  to improve readability.
* LC_COLLATE=C to prevent [a-zA-Z] from matching non-ASCII characters.
* Use ${SED} if defined.

(apb)

Fix decoding of near CALL when address-size prefix (67h) is present.

From Wolf Ramovsky via FreeBSD.

(joerg)

Fix decoding of LEA when address-size prefix (67h) is present.

From Wolf Ramovsky via FreeBSD, loosly based on Xorg changeset f57bc0e
by Christian Zander.

(joerg)

Adapt to increased ramdisk size

(martin)

Bump imagesize slightly

(martin)

Regenerate for:
  ATMEL WN210 is actually ID 0x4102 (spotted by mlelstv).

(jdc)

ATMEL WN210 is actually ID 0x4102 (spotted by mlelstv).

(jdc)

Fix debug sets for zaurus

(martin)

Fix decoding of MOVSX. From Wolf Ramovsky via FreeBSD.

(joerg)

Save arguments from uboot at the very beginning in odroid_start.S supporting
both the `bootm' as the `go' method. While here, also implement the mac
address passing and parsing for the usmsc0 device.

(reinoud)

Fix typo in comment.

(ryoon)

At least crypto_mtx needs initialisation here.  Spotted during PR/49065
investigation.

(skrll)

Bump miniroot size

(martin)

Reorder code so bootconfig is initialized at one place

(reinoud)

Slightly extend ramdisk size

(martin)

Remove old bootargs hack; now just rely on the common `BOOT_ARGS' config
variable if defined.

(reinoud)

Adapt to extended partitioning support

(martin)

Rename the "exit" option in the "select your installation" menu into
"Abandon installation" to make clear it is fatal - suggested by
Andreas Gustafsson.

(martin)

Add missing netbsd32_machdep.h file

(martin)

Fix duplicate assignment to NULL of sqtdstart in ehci_device_isoc_start
and initialise sqtdend is NULL instead.

From OpenBSD.

(skrll)

for the !tmpfs case, ensure that pm_with_swap is initialised.

(mrg)

Link against radeon_libdrm.
Re-enable building kms bits, ok mrg@.

(rjs)

in6_pcbdetach: now that IGMP and multicast groups are MP-safe, we can move
the ip6_freemoptions() call outside the softnet_lock.  Should fix PR/49065.

(rmind)

in_pcbdetach: not that IGMP and multicast groups are MP-safe, we can move
the ip_freemoptions() call outside the softnet_lock.  Should fix PR/49065.

(rmind)

defintion -> definition

(wiz)

hpcarm wants earmv4 because some models only have v4 CPUs.

(riz)

Add a few missing netbsd32_machdep.h files

(martin)

backout previous, there was no eabi switch for arcon26

(martin)

(Finally) merge a slightly modified version of the 2012 GSoC results
from Eugene Lozovoy: add extended partitioning options to sysinst.
Still needs some testing and polishing, but it now is possible to use GPT
or to create a RAID set from scratch and install onto it.

(martin)

Work around escaping issues with quotes in substitutions, to fix cross builds

(justin)

Fix typo in comment.

(wiz)

req cannot be PRU_SENDOOB here as per KASSERT() earlier in the
rip_usrreq() function.

-      KASSERT(!control || (req == PRU_SEND || req == PRU_SENDOOB));
+      KASSERT(!control || (req == PRU_SEND));

(rtr)

Mention BUILDINFO in doc/CHANGES file

(apb)

BUILDINFO part6: regen BUILDING from doc/BUILDING.mdoc

(apb)

Bump date for previous

(apb)

BUILDINFO part 5: Document BUILDINFO in doc/BUILDING.mdoc.

(apb)

BUILDINFO part 4: build.sh

Add BUILDINFO to the list of variables saved in the makewrapper script,
and print any non-blank BUILDINFO lines near the beginning of the output
from build.sh.
Index: build.sh
===================================================================
RCS file: /cvsroot/src/build.sh,v
retrieving revision 1.286
diff -d -p -u -r1.286 build.sh
--- build.sh 3 Aug 2014 01:03:41 -0000 1.286
+++ build.sh 3 Aug 2014 09:20:46 -0000
@@ -1299,6 +1299,7 @@ parseoptions()
#
makeenv="${makeenv} TOOLDIR MACHINE MACHINE_ARCH MAKEFLAGS"
[ -z "${BUILDID}" ] || makeenv="${makeenv} BUILDID"
+ [ -z "${BUILDINFO}" ] || makeenv="${makeenv} BUILDINFO"
MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}"
MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
export MAKEFLAGS MACHINE MACHINE_ARCH
@@ -2078,6 +2079,13 @@ main()
if [ -n "${BUILDID}" ]; then
statusmsg2 "BUILDID:"  "${BUILDID}"
fi
+ if [ -n "${BUILDINFO}" ]; then
+ printf "%b\n" "${BUILDINFO}" | \
+ while read -r line ; do
+ [ -s "${line}" ] && continue
+ statusmsg2 "BUILDINFO:"  "${line}"
+ done
+ fi

rebuildmake
validatemakeparams

(apb)

BUILDINFO part 3: Add BUILDINFO to RELEASEVARS and /etc/release

The BUILDINFO string will appear nearthe top of /etc/release,
indented by 8 spaces and with a blank line above and below it,
but without a heading.  The BUILDINFO string is expected to
be self-explanatory.

Also change some other headings near the top of /etc/release.

(apb)

Add COMPAT_NETBSD32 to more kernels (we have too many)

(martin)

BUILDINFO part 2: expose sysctl kern.buildinfo

(apb)

BUILDINFO part 1: newvers.sh

If the BUILDINFO environment variable is set, then interpret it as
a string with embedded C-style escapes and store it in a new
buildinfo variable in the emitted vers.c file.

Also centralise the awk code for converting a multi-line string
to C source code.

(apb)