Rename drm_drv.c to drm_cdevsw.c.

Previously we overrode upstream's drm_drv.c altogether, and used
upstream's drm_stub.c subroutines.

But upstream deleted drm_drv.c and renamed drm_stub.c to drm_drv.c,
so we have to cope with that reshuffle.

(riastradh)

Apply locally overridden files.

(riastradh)

Omit PCI files from files.drmkms.

(riastradh)

regen files.drmkms

(riastradh)

Move local files to the top to make them more visible.

(riastradh)

Forgot to nix conflicts after moving change to intel_runtime_pm.c.

(riastradh)

Forgot to nix conflicts after moving changes to i915_gem_fence.c.

(riastradh)

Rewrite hashtable.h locally so it might work here.

(riastradh)

Define CONFIG_PCI to 1, not empty.

(riastradh)

provide BUILD_BUG_ON_MSG

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

provide pr_notice
avoid needing unregister_oom_notifier
use intel_register_dsm_handler(dev), as older drm does
provide dummy async_schedule
provide atomic_or
match side-loading

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

provide CONFIG_PNP if it's defined. i386 only apparently.

XXX I'm not actually building i386 kernels

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

Rework nsecs_to_jiffies64.

(riastradh)

don't provide dev_to_i915 and ifdef out all users (unused)
provide nsecs_to_jiffies64, hopefully msec_to_jiffies * 10^6
provide BUILD_BUG as a no-op
include linux/err.h instead of matching side-loading, too hard to
figure out what gets it.

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

update i915_trace.h to build withotu -Werror

remove unused users of the type struct intel_ring_buffer
switch others to struct drm_i915_gem_request which is what callers
use.

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

provide missing declarations
add missing headers

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

directly include asm/bug.h for WARN_ON instead of fighting
to match side-loading.

include drm_legacy.h as needed

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

Forget about trying to replicate side-loading, will just include
directly

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

begin fixing -Werror build:

Provide missing declarations from older drm
provide more definitions used by code
no idea what might_lock is, but it might be some error-checking
lockdep thing.

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

... Provide GENMASK

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

un-static i915_disable_vga, used in intelfb.c.

Now I reach linking, and have a lot of undefined functions.
-Werror build still not handled.

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

merge in old drm

better match linux del_timer_sync by returning something
(XXX return value?)

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

bring in old drm changes

ifdef out some fb_info usage which we don't have and some of it
ifdef'd out in old drm

strangely reg_offset isn't used in the i2c whatever-thing

we need one more member to drm_fb_helper

define CONFIG_DRM_FBDEV_EMULATION so hopefully fewer redefinitions

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

Destroy mutex if we init it.

(riastradh)

provide enum irqreturn

merge in old ifdefs
ifdef out code that I'm unsure about right away and turn into panic
call.

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

move bitops.h so we can include it from kernel.h

match linux side-loading of this header.

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

Destroy mutex if we init it.

(riastradh)

some more definitions necessary

ifdef out all the i915 gtt virtual memory stuff that errors,
unless it looks exactly like the old code and then merge the
netbsd ifdefs for it.

we don't want to use their ALIGN(, which has more arguments,
use the old alt function.
merge in the old intel_acpi.c code.
don't duplicate DECLARE_BITMAP

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

something like hashtable.h from openbsd, WIP

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

bring in old drm changes
panic(XXX) out parts that need attention

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

make i915_trace.h match newer code

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

match linux side loading

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

more declarations of things we need.

more power management ops.

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

include guard for async.h

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

dummy file to quiet include warnings

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

match linux side loading of headers

more bring in OLD drm code to unbreak the build
matching netbsd types etc. to get the build going

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

include drm_legacy.h as needed...

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

move printk to common so we can reasonably include it from kernel.h
(linux side-loads the same)

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

bring in changes from OLDER drmP.h to go forward with compilation

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

mild modifications to avoid needing more headers

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

local versions of headers required

Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

(riastradh)

regen files.radeon

(riastradh)

regen files.nouveau

(riastradh)

regen files.i915drmkms

(riastradh)

Apply upstream deletions that I failed to apply in the merge.

(riastradh)

Move local i915 files earlier to make them more obvious.

(riastradh)

Scripts to generate radeon and intel file lists.

(riastradh)

Replace per-file warning options in radeon by radeon-wide options.

(riastradh)

Replace nouveau per-file warning options by nouveau-wide options.

(riastradh)

Move autogenerated files from dist/ to end of files.radeon.

(riastradh)

Add CFLAGS, CPPFLAGS, and CWARNFLAGS from options to .c files.

(riastradh)

Define px_dma for our bus_dmaish i915_dma_page.

(riastradh)

Tag each .c file with the options that might have brought it in.

(riastradh)

Move old DRM_READn definitions into new drm_iomap_netbsd.h

These got deleted from drmP.h.

(riastradh)

merge linux-drm-v4-4-143

(riastradh)

Restore splx removed accidentally at v1.406

Pointed out by k-goda@IIJ

(ozaki-r)

Handle uvm object reference counts in uvm_map more carefully.

Acquire a reference unconditionally first; then let uvm_map consume
it on success, and release it ourselves on failure.

As we did before -- acquiring a fresh reference on success -- another
thread might release the reference with a concurrent uvm_unmap before
we could acquire it back, thereby destroying the object.

XXX pullup-7
XXX pullup-8

(riastradh)

Restore gtt page table control register on resume.

Additional subroutine agp_i810_reset is used by i915drmkms to make
sure it happens early enough, since i915drmkms resumes before agp.

XXX pullup-7
XXX pullup-8

(riastradh)

Preliminary README for drm2 directory.

(riastradh)

New script to generate files.drmkms from Linux Makefile.

(riastradh)

Move cleantags and rcsid decorations to prepare-import.sh.

Also decorate .h files.

(riastradh)

Makefile got moved to Kbuild.  Make sure variables expand.

(riastradh)

Allow caller to specify mv so I can stage this in git.

(riastradh)

Remove reference to -c flag which was never implemented.

(sevan)

-G cannot be specified alongside -i or -P.

Heads up by <leot>

(sevan)

Disable mue(4) for INSTALL_C70 like other USB NICs.
Should fix build.

(rin)

Update usage to include -w
Match sequence as per SYNOPSIS in manual

(sevan)

Add -l to SYNOPSIS

(sevan)

Match SYNOPSIS with usage()

(sevan)

Document the WCPU field.

(sevan)

Add support for booting kernels from FFS partitions.

(jmcneill)

Add SLJIT to aarch64.

(rjs)

add event counter for the unaligned map to get a handle on how often this
actually happens

(jdolecek)

update TODO
* done: kernel text/rodata mapping with correct permission. implemented.
* add: kernel preemption

(ryo)

add support multiple cpu clusters.
* pass cpu index as an argument to secondary processors when hatching.
* keep cpu cache confituration per cpu clusters.

Hello big.LITTLE!

(ryo)

sdt.h deserves an RCS id like all the other header files.

(riastradh)

Refactor the numeric validity check just added, so the error
messages can be (easily) done better.

(kre)

Validate that the configuration parameters that are supposed to
be numeric are in fact numeric, and then have the awk script use
them as awk numbers, rather than strings, so awk isn't doing string
comparisons on numbers (where "1024" < 2).

This has no effect with current configuratons, but would if anyone
had ever attempted to configure a system with nsysent >= 1000

(kre)

Add back non-512-byte aligned buffers support (reverting 1.84).
Userland users of raw devices don't have to use sector-aligned buffers,
and e.g. disklabel doesn't.
anita tests on Xen should at last complete the install phase again.

(bouyer)

adjust to new libssh api.

(christos)

Ticket #990

(martin)

Pull up following revision(s) (requested by mlelstv in ticket #990):

sys/dev/usb/usb_subr.c: revision 1.224

add missing KERNEL_LOCK protection around autoconf calls.

Also replace NULL argument with curlwp for style.

(martin)

bump libssh

(christos)

new OpenSSH

(christos)

merge conflicts

(christos)

Fix Dd. New line after macro argument end.

(wiz)

Remove duplicate entry for XEN module build infrastructure.

(pgoyette)

Add mue(4).

(rin)

Set mac-address property to mue(4).

(rin)

Add (commented out) mue(4) to where appropriate.
Also add MII/PHY drivers for USB NICs if missing.

(rin)

Add mue(4), driver for Microchip LAN75xx/LAN78xx known as internal NIC of
Raspberry Pi 3 B+, from OpenBSD.

Tested on Raspberry Pi 3 B+ (LAN7800) and Z-TEK ZE582 (LAN7500).

* BUGS/TODO

- If the media type is set to something other than 1000baseT-FDX, data
  transmission becomes quite unstable. Also, ukphy(4) recognize 1000baseT as
  a supported media type, but it is not in fact.

- Catch up with changes made to usmsc(4) in nick-nhusb branch, i.e.,
  make the driver MP-safe.

- Support RX/VLAN/TX chekcsum offloading.

(rin)

typo

(dholland)

PR bin/48875

Add a paragraph (briefer than previously posted to mailing lists)
to explain that there is no guarantee that the results of a command
substitution will be available before all commands started by the
cmdsub have completed.

Include the original proposed text (much longer) as *roff comments, so
it will at least be available to those who browse the man page sources.

While here, clean up the existing text about command substitutions to
make it a little more accurate (and to advise against using the `` form).

(kre)

Fix merge mishap due to #983 / #989 pullup order.

(martin)

Ammend ticket #1632

(martin)

Pull up following revision(s) (requested by mrg in ticket #1632):

sys/dev/usb/usbdivar.h: revision 1.117
sys/external/bsd/dwc2/dwc2.c: revision 1.52
sys/dev/usb/xhcivar.h: revision 1.10
sys/dev/usb/motg.c: revision 1.22
sys/dev/usb/ehci.c: revision 1.260
sys/dev/usb/ehci.c: revision 1.261
sys/dev/usb/xhci.c: revision 1.96
sys/dev/usb/ohci.c: revision 1.282
sys/dev/usb/ohci.c: revision 1.283
sys/dev/usb/ehcivar.h: revision 1.45
sys/dev/usb/uhci.c: revision 1.281
sys/dev/usb/uhci.c: revision 1.282
sys/dev/usb/usbdi.c: revision 1.177
sys/dev/usb/ohcivar.h: revision 1.60
sys/dev/usb/uhcivar.h: revision 1.55
(all via patch)

pull across abort fixes from nick-nhusb.  add more abort fixes, using
ideas from Taylor and Nick, and myself.  special thanks to both who
inspired much of the code here, if not wrote it directly.

among other problems, this assert should no longer trigger:

  panic: kernel diagnostic assertion "xfer->ux_state == XFER_ONQU" failed: file "/current/src/sys/dev/usb/usbdi.c", line 914

using usbhist i was able to track down my instance of it being related
to userland close() beginning, dropping the sc_lock, and then the usb
softintr completes the transfer normally, and when it is done, the
abort path attempts to re-complete the transfer, and the above assert
is tripped.

changes from nhusb were commited with these logs:
--
Move the struct usb_task to struct usbd_xfer for everyone to use.
--
Set device transfer status to USBD_IN_PROGRESS if start methods succeeds
--
Actually set the transfer status on transfers in ohci_abort_xfer and
the controller is dying
--
Don't supply the lock to callout_halt when polling as it won't be held
--
Improve transfer abort
--
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling
--
--
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling
--

additional changes include:
- initialise the usb abort task in the HCI allocx routine, so that it
  can be safely usb_rem_task()'d.
- rework the handling of softintr vs cancellation vs timeout abort based
  upon a scheme from Taylor:
  when completing a transfer normally:
  - if the status is not in progress, it must be cancelled or timed out,
    and we should not process this xfer.
  - set the status as normal.
  - unconditionallly callout_stop() and usb_rem_task().  they're safe and
    either aren't running, or will run and do nothing.
  - finally call usb_transfer_complete().
  when aborting a transfer:
  - status should be cancelled or timed out.
  - if cancelling, callout_halt and usb_rem_task_wait() to make sure the
    timer is either done or cancelled.
  - at this point, the ux_status must not be cancelled or timed out, and
    if it is not in progress we're done.
  - set the status.
  - if the controller is dying, just return.
  - perform HCI-specific tasks to abort this xfer.
  - finally call usb_transfer_complete().
  for the timeout and timeout task:
  - if the HCI is not dying, and the ux_status is in progress, then
    trigger the usb abort task.
- remove UXFER_ABORTWAIT and UXFER_ABORTING.

tested on:
- multiple PC systems with several types of devices: ugen/UPS, ucom,
  umass with disk, ssd and cdrom backends, kbd, ms, using uhci, ehci
  and xhci.
- erlite3: sd@umass on dwc2.
- sunblade2000: kbd/ms and umass disk on ohci.

untested:
- motg, slhci and ahci.  motg has some portion of the new scheme
  applied, but slhci and ahci require more study.

future work includes pushing a lot of the common abort handling into
usbdi.c and leaving upm_abort() for HC specific tasks, but this change
is pullup-able to netbsd-7 and netbsd-8 as it does not change any
external API, as well as removing over 100 lines of code while adding
over 30 new asserts.

XXX: pullup-7, pullup-8.

fix DIAGNOSTIC build by not copying ub_usepolling to stack before use

Sprinkle __diagused

(martin)

Tickets #1631 - #1634

(martin)

Catch up to current for the following, requested by kre in ticket #1634:

external/public-domain/tz/dist/Makefile        up to 1.1.1.21
external/public-domain/tz/dist/NEWS            up to 1.1.1.22
external/public-domain/tz/dist/TZDATA_VERSION  up to 1.12
external/public-domain/tz/dist/africa          up to 1.1.1.15
external/public-domain/tz/dist/asia            up to 1.1.1.20
external/public-domain/tz/dist/australasia      up to 1.1.1.15
external/public-domain/tz/dist/europe          up to 1.1.1.21
external/public-domain/tz/dist/theory.html      up to 1.1.1.4
external/public-domain/tz/dist/version          up to 1.1.1.9
external/public-domain/tz/dist/ziguard.awk      up to 1.1.1.2
doc/3RDPARTY 1.1520 (patch)

Import tzdata2018e from ftp://ftp.iana.org/tz/releases/tzdata2018e.tar.gz

Summary of changes in tzdata2018e (2018-05-01 23:42:51 -0700):

News for the tz database

Release 2018e - 2018-05-01 23:42:51 -0700

    North Korea switches back to +09 on 2018-05-05 (tomorrow!)

(martin)

Sync to head the following, requested by roy in ticket #1633:

        external/bsd/dhcpcd/dist/src/defs.h            up to 1.1.1.16
        external/bsd/dhcpcd/dist/src/dhcp.c            up to 1.13
        external/bsd/dhcpcd/dist/src/dhcp6.c            up to 1.1.1.13
        external/bsd/dhcpcd/dist/src/if-bsd.c          up to 1.1.1.9
        external/bsd/dhcpcd/dist/src/if.c              up to 1.1.1.9
        external/bsd/dhcpcd/dist/src/ipv4.c            up to 1.1.1.10
        external/bsd/dhcpcd/dist/src/ipv6.c            up to 1.1.1.12
        doc/3RDPARTY                                    (manually edited)

Import dhcpcd-7.0.8 with the following changes:
  *  Don't use IP_PKTINFO on NetBSD-7 as it's incomplete.
  *  Workaround RTM_NEWADDR sending the wrong broadcast address
    on NetBSD-7.
  *  Silence diagnostics if an address vanishes when reading
    it's flags on all BSD's.
  *  Misc compiler warnings fixed.

(martin)

Pull up following revision(s) (requested by mrg in ticket #1632):

sys/dev/usb/usbdivar.h: revision 1.117
sys/external/bsd/dwc2/dwc2.c: revision 1.52
sys/dev/usb/xhcivar.h: revision 1.10
sys/dev/usb/motg.c: revision 1.22
sys/dev/usb/ehci.c: revision 1.260
sys/dev/usb/ehci.c: revision 1.261
sys/dev/usb/xhci.c: revision 1.96
sys/dev/usb/ohci.c: revision 1.282
sys/dev/usb/ohci.c: revision 1.283
sys/dev/usb/ehcivar.h: revision 1.45
sys/dev/usb/uhci.c: revision 1.281
sys/dev/usb/uhci.c: revision 1.282
sys/dev/usb/usbdi.c: revision 1.177
sys/dev/usb/ohcivar.h: revision 1.60
sys/dev/usb/uhcivar.h: revision 1.55
(all via patch)

pull across abort fixes from nick-nhusb.  add more abort fixes, using
ideas from Taylor and Nick, and myself.  special thanks to both who
inspired much of the code here, if not wrote it directly.

among other problems, this assert should no longer trigger:

  panic: kernel diagnostic assertion "xfer->ux_state == XFER_ONQU" failed: file "/current/src/sys/dev/usb/usbdi.c", line 914

using usbhist i was able to track down my instance of it being related
to userland close() beginning, dropping the sc_lock, and then the usb
softintr completes the transfer normally, and when it is done, the
abort path attempts to re-complete the transfer, and the above assert
is tripped.

changes from nhusb were commited with these logs:
--
Move the struct usb_task to struct usbd_xfer for everyone to use.
--
Set device transfer status to USBD_IN_PROGRESS if start methods succeeds
--
Actually set the transfer status on transfers in ohci_abort_xfer and
the controller is dying
--
Don't supply the lock to callout_halt when polling as it won't be held
--
Improve transfer abort
--
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling
--
--
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling
--

additional changes include:
- initialise the usb abort task in the HCI allocx routine, so that it
  can be safely usb_rem_task()'d.
- rework the handling of softintr vs cancellation vs timeout abort based
  upon a scheme from Taylor:
  when completing a transfer normally:
  - if the status is not in progress, it must be cancelled or timed out,
    and we should not process this xfer.
  - set the status as normal.
  - unconditionallly callout_stop() and usb_rem_task().  they're safe and
    either aren't running, or will run and do nothing.
  - finally call usb_transfer_complete().
  when aborting a transfer:
  - status should be cancelled or timed out.
  - if cancelling, callout_halt and usb_rem_task_wait() to make sure the
    timer is either done or cancelled.
  - at this point, the ux_status must not be cancelled or timed out, and
    if it is not in progress we're done.
  - set the status.
  - if the controller is dying, just return.
  - perform HCI-specific tasks to abort this xfer.
  - finally call usb_transfer_complete().
  for the timeout and timeout task:
  - if the HCI is not dying, and the ux_status is in progress, then
    trigger the usb abort task.
- remove UXFER_ABORTWAIT and UXFER_ABORTING.

tested on:
- multiple PC systems with several types of devices: ugen/UPS, ucom,
  umass with disk, ssd and cdrom backends, kbd, ms, using uhci, ehci
  and xhci.
- erlite3: sd@umass on dwc2.
- sunblade2000: kbd/ms and umass disk on ohci.

untested:
- motg, slhci and ahci.  motg has some portion of the new scheme
  applied, but slhci and ahci require more study.

future work includes pushing a lot of the common abort handling into
usbdi.c and leaving upm_abort() for HC specific tasks, but this change
is pullup-able to netbsd-7 and netbsd-8 as it does not change any
external API, as well as removing over 100 lines of code while adding
over 30 new asserts.

XXX: pullup-7, pullup-8.

fix DIAGNOSTIC build by not copying ub_usepolling to stack before use

Sprinkle __diagused

(martin)

Pull up following revision(s) (requested by roy in ticket #1631):

etc/powerd/scripts/sleep_button: revision 1.11

Remove the stopping and starting of various network scripts on
sleep / resume.

This should no longer be needed now the various applications
(dhcpcd, ntpd, wpa_supplicant et all) are more aware to the network state
as all interface carriers should be brought down and up again.

Fixes PR misc/52397.

(martin)

Tickets #977, #978, #981 - #989

(martin)

Pull up following revision(s) (requested by kre in ticket #989):

bin/sh/eval.c: revision 1.156
bin/sh/eval.h: revision 1.20
bin/sh/exec.c: revision 1.53

Fix several bugs in the command / type builtin ( including PR bin/48499 )

1. Make command -pv (and -pV) work (which is not as easy as the PR
  suggests it might be (the "check and cause error" was there because
  it did not work, not in order to prevent it from working).

2. Stop -v and -V being both used (that makes no sense).

3. Stop the "type" builtin inheriting the args (-pvV) that "command" has
  (which it did, as when -v -or -V is used with command, it and type are
    implemented using the same code).

4. make "command -v word" DTRT for sh keywords (was treating them as an error).

5. Require at least one arg for "command -[vV]" or "type" else usage & error.
  Strictly this should also apply to "command" and "command -p" (no -v)
  but that's handled elsewhere, so perhaps some other time.  Perhaps
  "command -v" (and -V) should be limited to 1 command name (where "type"
  can have many) as in the POSIX definitions, but I don't think that matters.

6. With "command -V alias", (or "type alias" which is the same thing),
  (but not "command -v alias") alter the output format, so we get
ll is an alias for: ls -al
  instead of the old
ll is an alias for
ls -al
  (and note there was a space, for some reason, after "for")
  That is, unless the alias value contains any \n characters, in which
  case (something approximating) the old multi-line format is retained.
  Also note: that if code wants to parse/use the value of an alias, it
  should be using the output of "alias name", not command or type.

Note that none of the above affects "command [-p] cmd" (no -v or -V options)
only "command -[vV]" and "type".

Note also that the changes to eval.[ch] are merely to make syspath()
visible in exec.c rather than static in eval.c

(martin)

Pull up following revision(s) (requested by kre in ticket #988):

bin/sh/parser.c: revision 1.147
bin/sh/var.c: revision 1.70
bin/sh/mystring.c: revision 1.18
bin/sh/options.c: revision 1.53
bin/sh/histedit.c: revision 1.53

Remove atoi()

Mostly use number() (no longer implemented using atoi()) when an
unsigned integer is required, but use strtoXXX() when a conversion
is wanted, without the possibility or error (like setting OPTIND
and RANDOM).  Always init OPTIND to 1 when sh starts (overriding
anything in environ.)

(martin)

Pull up following revision(s) (requested by kre in ticket #987):

bin/sh/trap.c: revision 1.44

PR bin/36532 (perhaps)

This is more or less the same patch as provided in the PR
(just 11 years later, so changed a bit) by woods@...

Since there is no known way to actually cause the reported crash,
we may never know if this change actually fixes anything.  But
even if it doesn't it certainly cannot hurt.

There is a potential race which could possibly explain the issue
(see commentary in the PR) which is not easy to avoid - if that is
the actual cause, this should provide a defence, if not really a fix.

(martin)

Pull up following revision(s) (requested by ozaki-r in ticket #986):

sys/netipsec/key.c: revision 1.257

Don't call key_ismyaddr, which may sleep, in a pserialize read section

Use mutex here instead of pserialize because using mutex is simpler than
using psz+ref, which is another solution, and key_checkspidup isn't called in
any performance-sensitive paths.

(martin)

Pull up following revision(s) (requested by manu in ticket #985):

crypto/external/bsd/openssl/lib/libcrypto/arch/i386/modes.inc: revision 1.2
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/modes.inc: revision 1.3

Add missing defines:
https://github.com/openssl/openssl/pull/6828

When ghash-x86.S is generated with -DOPENSSL_IA32_SSE2 we need to
compile
gcm128.c with the same flags.

Reported by manu@

remove -DGHASH_ASM_X86; it is already defined.

(martin)

Pull up following revision(s) (requested by jdolecek in ticket #984):

sys/arch/xen/xen/xbd_xenbus.c: revision 1.83

avoid race condition between I/O submission in xbd_diskstart() and
interrupt handling in xbd_handler() - need to protect it with splbio()

fixes PR port-xen/53506 by Emmanuel Dreyfus, and likely also port-xen/53074
by Brad Spencer

(martin)

Pull up following revision(s) (requested by kre in ticket #983):

bin/sh/eval.c: revision 1.158
bin/sh/eval.h: revision 1.21
bin/sh/main.c: revision 1.74

PR bin/48875

Revert the changes that were made 19 May 2016 (principally eval.c 1.125)
and the bug fixes in subsequent days (eval.c 1.126 and 1.127) and also
update some newer code that was added more recently which acted in
accordance with those changes (make that code be as it would have been
if the changes now being reverted had never been made).

While the changes made did solve the problem, in a sense, they were
never correct (see the PR for some discussion) and it had always been
intended that they be reverted.  However, in practical sh code, no
issues were reported - until just recently - so nothing was done,
until now...

After this commit, the validate_fn_redirects test case of the sh ATF
test t_redir will fail.  In particular, the subtest of that test
case which is described in the source (of the test) as:

This one is the real test for PR bin/48875

will fail.

Alternative changes, not to "fix" the problem in the PR, but to
often avoid it will be coming very soon - after which that ATF
test will succeed again.

XXX pullup-8

(martin)

Pull up following revision(s) (requested by kre in ticket #982):

bin/sh/eval.c: revision 1.157

PR bin/42184 PR bin/52687  (detailing the same bug).

Fix "command not found" handling so that the error message
goes to stderr (after any redirections are applied).

More importantly, in

foo > /tmp/junk

/tmp/junk should be created, before any attempt is made
to execute (the assumed non-existing) "foo".

All this was always true for any command (not found command)
containing a / in its name

foo/bar >/tmp/junk  2>>/tmp/errs

would have created /tmp/junk, then complained (in /tmp/errs)
about foo/bar not being found.  Now that happens for ordinary
commands as well.

The fix (which I found when I saw differences between our
code and FreeBSD's, where, for the benefit of PR 42184,
this has been fixed, sometime in the past 9 years) is
frighteningly simple.  Simply do not short circuit execution
(or print any error) when the initial lookup fails to
find the command - it will fail anyway when we actually
try running it.  The cost is a (seemingly unnecessary,
except that it really is) fork in this case.

This is what I had been planning, but I expected it would
be much more difficult than it turned out....

XXX pullup-8

(martin)

Sync to head the following, requested by roy in ticket #981:

external/bsd/dhcpcd/dist/src/defs.h            up to 1.1.1.16
external/bsd/dhcpcd/dist/src/dhcp.c            up to 1.13
external/bsd/dhcpcd/dist/src/dhcp6.c            up to 1.1.1.13
external/bsd/dhcpcd/dist/src/if-bsd.c          up to 1.1.1.9
external/bsd/dhcpcd/dist/src/if.c              up to 1.1.1.9
external/bsd/dhcpcd/dist/src/ipv4.c            up to 1.1.1.10
external/bsd/dhcpcd/dist/src/ipv6.c            up to 1.1.1.12
doc/3RDPARTY (manually edited)

Import dhcpcd-7.0.8 with the following changes:
  *  Don't use IP_PKTINFO on NetBSD-7 as it's incomplete.
  *  Workaround RTM_NEWADDR sending the wrong broadcast address
    on NetBSD-7.
  *  Silence diagnostics if an address vanishes when reading
    it's flags on all BSD's.
  *  Misc compiler warnings fixed.

(martin)

Pull up following revision(s) (requested by mrg in ticket #980):

sys/dev/usb/usbdivar.h: revision 1.117
sys/external/bsd/dwc2/dwc2.c: revision 1.52
sys/dev/usb/xhcivar.h: revision 1.10
sys/dev/usb/motg.c: revision 1.22
sys/dev/usb/ehci.c: revision 1.260
sys/dev/usb/ehci.c: revision 1.261
sys/dev/usb/xhci.c: revision 1.96
sys/dev/usb/ohci.c: revision 1.282
sys/dev/usb/ohci.c: revision 1.283
sys/dev/usb/ehcivar.h: revision 1.45
sys/dev/usb/uhci.c: revision 1.281
sys/dev/usb/uhci.c: revision 1.282
sys/dev/usb/usbdi.c: revision 1.177
sys/dev/usb/ohcivar.h: revision 1.60
sys/dev/usb/uhcivar.h: revision 1.55
(all via patch)

pull across abort fixes from nick-nhusb.  add more abort fixes, using
ideas from Taylor and Nick, and myself.  special thanks to both who
inspired much of the code here, if not wrote it directly.
among other problems, this assert should no longer trigger:

  panic: kernel diagnostic assertion "xfer->ux_state == XFER_ONQU" failed: file "/current/src/sys/dev/usb/usbdi.c", line 914

using usbhist i was able to track down my instance of it being related
to userland close() beginning, dropping the sc_lock, and then the usb
softintr completes the transfer normally, and when it is done, the
abort path attempts to re-complete the transfer, and the above assert
is tripped.

changes from nhusb were commited with these logs:
--
Move the struct usb_task to struct usbd_xfer for everyone to use.
--
Set device transfer status to USBD_IN_PROGRESS if start methods succeeds
--
Actually set the transfer status on transfers in ohci_abort_xfer and
the controller is dying
--
Don't supply the lock to callout_halt when polling as it won't be held
--
Improve transfer abort
--
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling
--
--
Mark device transfers as USBD_IN_PROGRESS appropriately and improve
abort handling
--

additional changes include:
- initialise the usb abort task in the HCI allocx routine, so that it
  can be safely usb_rem_task()'d.
- rework the handling of softintr vs cancellation vs timeout abort based
  upon a scheme from Taylor:
  when completing a transfer normally:
  - if the status is not in progress, it must be cancelled or timed out,
    and we should not process this xfer.
  - set the status as normal.
  - unconditionallly callout_stop() and usb_rem_task().  they're safe and
    either aren't running, or will run and do nothing.
  - finally call usb_transfer_complete().
  when aborting a transfer:
  - status should be cancelled or timed out.
  - if cancelling, callout_halt and usb_rem_task_wait() to make sure the
    timer is either done or cancelled.
  - at this point, the ux_status must not be cancelled or timed out, and
    if it is not in progress we're done.
  - set the status.
  - if the controller is dying, just return.
  - perform HCI-specific tasks to abort this xfer.
  - finally call usb_transfer_complete().
  for the timeout and timeout task:
  - if the HCI is not dying, and the ux_status is in progress, then
    trigger the usb abort task.
- remove UXFER_ABORTWAIT and UXFER_ABORTING.

tested on:
- multiple PC systems with several types of devices: ugen/UPS, ucom,
  umass with disk, ssd and cdrom backends, kbd, ms, using uhci, ehci
  and xhci.
- erlite3: sd@umass on dwc2.
- sunblade2000: kbd/ms and umass disk on ohci.

untested:
- motg, slhci and ahci.  motg has some portion of the new scheme
  applied, but slhci and ahci require more study.

future work includes pushing a lot of the common abort handling into
usbdi.c and leaving upm_abort() for HC specific tasks, but this change
is pullup-able to netbsd-7 and netbsd-8 as it does not change any
external API, as well as removing over 100 lines of code while adding
over 30 new asserts.

XXX: pullup-7, pullup-8.

fix DIAGNOSTIC build by not copying ub_usepolling to stack before use

Sprinkle __diagused

(martin)

Pull up following revision(s) (requested by maxv in ticket #978):

dist/pf/share/man/man4/pfsync.4: revision 1.7
dist/pf/share/man/man4/pf.4: revision 1.13
dist/pf/share/man/man5/pf.os.5: revision 1.7
dist/pf/share/man/man4/pflog.4: revision 1.7
dist/pf/share/man/man5/pf.conf.5: revision 1.17

Add a bold note to say our PF is obsolete.

Add a deprecation note in each of the PF man pages (instead of just pf.4),
so that it's really clear.

(martin)

Pull up following revision(s) (requested by mrg in ticket #977):

sys/compat/netbsd32/netbsd32_fs.c: revision 1.81
sys/compat/netbsd32/netbsd32.h: revision 1.119

support nullfs in netbsd32.

(martin)

obsolete ndiscvt

(martin)

Remove userland part of ndis

(martin)

Add KAUTH_REQ_PROCESS_CANSEE_EPROC, and use it for the kern.proc node.
Same permission as before, so no functional change.

(maxv)

Belatedly note the removal of vm86 (me, one year ago), and n8 (maya, two
weeks ago).

(maxv)

Note removal of NDIS.

(maxv)

Retire NDIS. It appears that it has never worked, after 13 years it was
still marked as "experimental", and nowadays it may be one more obstacle
to MPification of the network stack.

Discussed on tech-net@.

(maxv)

Pull up following revision(s) (requested by roy in ticket #976):

sbin/route/route.c: revision 1.160

Resolve every route(4) message type before printing anything more about it
other than the type and length.

This solves the issue where RTM_ONEWADDR is received and it tries to
parse route information from it.

(martin)

Disable POOL_REDZONE until we figure out what's wrong. There must be a dumb
problem, that is not triggerable on amd64.

(maxv)

PR bin/53548

Deal with the new shell internal exit reason EXEXIT in the case of
a shell which has vfork()'d.  It takes a peculiar set of circumstances
to get into a situation where this is ever relevant, but it can be
done.  See the PR for details.

(kre)

Separate the TODO list into two lists, required-for-merge vs not-required.

Expand a couple entries.

(pgoyette)

arm: Add UEFI boot loader for ARM64 platforms.

(jmcneill)

Build and install bootaa64.efi on 64-bit evbarm

(jmcneill)

Use absolute paths for default kernel filenames

(jmcneill)

If we could not query the DevicePathProtocol handle, just select no default boot device instead of exiting.

(jmcneill)

Sanitize the memory map passed to the kernel.

(jmcneill)

If the boot device could not be determined, use the first one found as
the default. While here, remove unnecessary calls to LibFileSystemInfo().

(jmcneill)

/cpus node may have any nodes except cpu. count only nodes of device_type "cpu"

(ryo)