HardenedBSD/hardenedbsd a906febsys/vm vm_unix.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-5sys/vm/vm_unix.c
+0-51 files

HardenedBSD/hardenedbsd 887d9e4lib/libcasper/services/cap_sysctl cap_sysctl.c cap_sysctl.3, lib/libcasper/services/cap_sysctl/tests sysctl_test.c

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        sys/vm/vm_unix.c (unresolved)

LLVM/llvm 369852llvm/trunk/include/llvm/MC SubtargetFeature.h

Hack around a GCC ICE that was fixed in GCC 6.2

lib/Target/X86/AsmParser/X86AsmParser.cpp: In member function ‘void 
{anonymous}::X86AsmParser::SwitchMode(unsigned int)’:
lib/Target/X86/AsmParser/X86AsmParser.cpp:927:76:   in constexpr expansion of 
‘AllModes.llvm::FeatureBitset::FeatureBitset(std::initializer_list<unsigned int>{((const 
unsigned int*)(& ._157)), 3u})’
include/llvm/MC/SubtargetFeature.h:56:12:   in constexpr expansion of 
‘llvm::FeatureBitset::set(I)’
lib/Target/X86/AsmParser/X86AsmParser.cpp:927:76: internal compiler error: in 
fold_binary_loc, at fold-const.c:9921
     FeatureBitset AllModes({X86::Mode64Bit, X86::Mode32Bit, X86::Mode16Bit});
                                                                            ^

HardenedBSD/hardenedbsd eb4bf8alib/libthr/thread thr_cancel.c thr_init.c

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC r351349: Fix _pthread_cancel_enter() and _pthread_cancel_leave() jmptable entries.

FreeBSD/ports 509728head/misc/dive Makefile

misc/dive: Switch to USES=go:modules, fix build with go1.13

PR:            240074
Reported by:    Dmitri Goutnik <dg at syrec.org>

FreeBSD/src 351459head/usr.bin/last last.c

last(1): correction after r351413

Make that change no-op for C/POSIX locale just like for UTF-8
that it superset of US-ASCII.

MFC after:      2 weeks
X-MFC-With:     r351413

NetBSD/pkgsrc T07qdRBsecurity/doas Makefile

   security/doas: change license to add bsd-3 and isc.
VersionDeltaFile
1.2+2-2security/doas/Makefile
+2-21 files

LLVM/llvm 369851llvm/trunk/include/llvm/MC SubtargetFeature.h

Try to make MSVC 2017 happy.

AArch64BaseInfo.h(316): error C3615: constexpr function 'llvm::SysAlias::SysAlias' cannot 
result in a constant expression
AArch64BaseInfo.h(316): note: failure was caused by call of undefined function or one not 
declared 'constexpr'
AArch64BaseInfo.h(316): note: see usage of 'llvm::FeatureBitset::FeatureBitset'

OpenBSD/ports i9WIOfywww/chromium Makefile

   add build dependency on libnotify
VersionDeltaFile
1.458+2-1www/chromium/Makefile
+2-11 files

FreeBSD/src 351458head/share/man/man4 nvdimm.4 Makefile

Add nvdimm(4) man page.

Reviewed by:    emaste
Discussed with: scottl, scottph
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Differential revision:  https://reviews.freebsd.org/D21386

FreeBSD/src 351457head/sys/amd64/amd64 machdep.c pmap.c, head/sys/amd64/include counter.h md_var.h

amd64: rework PCPU allocation

Move pcpu KVA out of .bss into dynamically allocated VA at
pmap_bootstrap().  This avoids demoting superpage mapping .data/.bss.
Also it makes possible to use pmap_qenter() for installation of
domain-local pcpu page on NUMA configs.

Refactor pcpu and IST initialization by moving it to helper functions.

Reviewed by:    markj
Tested by:      pho
Discussed with: jeff
Sponsored by:   The FreeBSD Foundation
Differential revision:  https://reviews.freebsd.org/D21320

FreeBSD/src 351456head/sys/amd64/amd64 mp_machdep.c

Do not constrain allocations for doublefault, boot, and mce stacks.

All these stacks are used only once (doublefault, boot) or very rare
(mce).

Reviewed by:    markj
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
Differential revision:  https://reviews.freebsd.org/D21320

FreeBSD/src 351455head/sys/amd64/amd64 mp_machdep.c

Style.

LLVM/llvm 369850llvm/trunk/include/llvm/Analysis TargetLibraryInfo.h, llvm/trunk/lib/Analysis TargetLibraryInfo.cpp

Fix some accidental global initializers by using StringLiteral instead of StringRef

FreeBSD/src 351454head/sys/amd64/amd64 mp_machdep.c

Remove unecessary VM_ALLOC_ZERO from allocation of the domain-local
page for pcpu.

Reviewed by:    markj
Tested by:      pho
Sponsored by:   The FreeBSD Foundation
Differential revision:  https://reviews.freebsd.org/D21320

FreeBSD/ports 509727head/security/kbfsd distinfo Makefile

security/kbfsd: Update to v1.4.1

LLVM/llvm 369849llvm/trunk/test/TableGen generic-tables-instruction.td generic-tables.td

Update tablegen test after r369847.

FreeBSD/ports 509726head/www/p5-WWW-Mechanize distinfo Makefile

- Update to 1.92
- Add missing TEST_DEPENDS

LLVM/llvm 369848llvm/trunk/tools/llvm-reduce/deltas ReduceGlobalVars.cpp

[llvm-reduce] Silence -Wdocumentation

ReduceGlobalVars.cpp:17:6: warning: '@returns' command used in a comment that is attached 
to a function returning void

LLVM/llvm 369847llvm/trunk/include/llvm/MC SubtargetFeature.h, llvm/trunk/lib/Target/AArch64/Utils AArch64BaseInfo.h

Use a bit of relaxed constexpr to make FeatureBitset costant intializable

This requires std::intializer_list to be a literal type, which it is
starting with C++14. The downside is that std::bitset is still not
constexpr-friendly so this change contains a re-implementation of most
of it.

Shrinks clang by ~60k.

FreeBSD/src 351453head/sys/vm vm_map.c

Make stack grow use the same gap as stack create.

Store stack_guard_page * PAGE_SIZE into the gap->next_read field at
the time of the stack creation.  This makes the used guard size
consistent between stack creation and stack grow time.

Suggested by:   alc
Reviewed by:    alc, markj
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D21384
DeltaFile
+14-2head/sys/vm/vm_map.c
+14-21 files

NetBSD/src dMLBOYgsys/compat/linux/common linux_misc.c

   I don't see the point in having this useless printf, but add a '\n' to it,
   so that it at least displays useless stuff correctly.
VersionDeltaFile
1.244+3-3sys/compat/linux/common/linux_misc.c
+3-31 files

NetBSD/src 3DvaaIasys/compat/linux/common linux_socket.c

   Fix memory leak.

NetBSD/src AWBARTmsys/compat/linux/common linux_socket.c

   Hum, don't pass an mbuf to realloc(). Inspired from copyin32_msg_control().

OpenBSD/src ikrtDpssys/scsi scsiconf.c scsiconf.h

   Simply logic of detaching things. scsi_detach_bus() folded into
   scsi_detach(), scsi_detach_target() and scsi_detach_lun() become
   simple wrappers of scsi_detach() invocations.

   No intentional functional change.
VersionDeltaFile
1.207+44-53sys/scsi/scsiconf.c
1.170+1-2sys/scsi/scsiconf.h
+45-552 files

FreeBSD/src 351452head/sys/dts/arm/overlays sun8i-h3-ths.dtso sun8i-h3-sid.dtso, head/sys/modules/dtb/allwinner Makefile

dtso: allwinner: Add an overlay for H3 thermal node

Reviewed by:    manu

OpenBSD/src rQUxFKMsbin/iked iked.conf.5

   Clarify "protected-subnet" option.

   Explain the use of the option (according to the RFC) and make clear it is
   not usually needed for subnets specified in "from" and "to" options.

   ok sthen@
VersionDeltaFile
1.57+8-3sbin/iked/iked.conf.5
+8-31 files

FreeBSD/ports 509725head/lang/angelscript/files patch-as_config.h

lang/angelscript: remove unnecessary AS_BIG_ENDIAN

Reported by:    jbeich

NetBSD/src VXVytC1lib/libnpf Makefile, lib/npf mod.mk

   libnpf fix: link the library itself to libnv; libnpf users should not be
   expected to assume this dependency.

OpenBSD/src KPX3EqDsbin/iked ikev2.c ikev2_pld.c

   Fix conflict when IKE SA and Child SA rekeying happen at the same time.

   If the IKE SA changes during an ongoing rekey exchange, messages may be
   lost because they were inteded for the old SA. An iked instance that is
   waiting for a rekey Child SA response will no longer reply to IKE SA
   rekey requests until the ongoing Child SA exchange has completed or
   timed out.

   ok sthen@
VersionDeltaFile
1.174+10-1sbin/iked/ikev2.c
1.74+10-1sbin/iked/ikev2_pld.c
+20-22 files

LLVM/llvm 369846cfe/trunk/lib/Sema SemaLookup.cpp, cfe/trunk/utils/TableGen ClangOpenCLBuiltinEmitter.cpp

[OpenCL] Microoptimize OCL2Qual a bit

Still not optimal, but makes clang 25k smaller.

FreeBSD/ports 509724head/devel/py-validators distinfo Makefile

devel/py-validators: Update to 0.14.0

Changelog:
  - Added new validators ``ipv4_cidr``, ``ipv6_cidr``
    (#117, pull request courtesy woodruffw)

NetBSD/src M5rTKZJexternal/cddl/osnet/dist/uts/common/fs/zfs dnode.c

   Add missing dmu_zfetch_fini() when dnode_create() lost the race.

NetBSD/src fEQMKaMexternal/cddl/osnet/dist/uts/common/fs/zfs zfs_vnops.c

   Implement kqueue support.

NetBSD/src Ny7bd1aexternal/cddl/osnet/dist/uts/common/fs/zfs zfs_vnops.c

   Implement poll support.

HardenedBSD/hardenedbsd 2a056a7lib/libthr/thread thr_cancel.c thr_init.c

MFC r351349:
Fix _pthread_cancel_enter() and _pthread_cancel_leave() jmptable entries.

PR:     240022

FreeBSD/src 351451stable 12, stable/12/lib/libthr/thread thr_cancel.c thr_init.c

MFC r351349:
Fix _pthread_cancel_enter() and _pthread_cancel_leave() jmptable entries.

PR:     240022

FreeBSD/ports 509723head/textproc/py-packageurl-python Makefile distinfo

textproc/py-packageurl-python: Update to 0.8.7

* Add "do-test" target to easen future QA
* Pet portlint (whitespace issues in pkg-descr)

Changelog:

https://github.com/package-url/packageurl-python/compare/v0.8.5...v0.8.7

FreeBSD/ports 509722head/math/amath Makefile, head/math/amath/files patch-src_real_prim.h

math/amath: fix build on powerpc* and mips*

The big-endian ifdef misses ||.

PR:            239298
Approved by:    cs at innolan.net (maintainer timeout), linimon (mentor)

FreeBSD/ports 509721head/databases/xtrabackup/files patch-cmake_os_FreeBSD.cmake

databases/xtrabackup: fix build on GCC architectures

Patch this port similarly to other mysql/mariadb/percona ports - make GCC a valid 
compiler.

PR:            239310
Approved by:    aleks at twindb.com (maintainer timeout), linimon (mentor)

FreeBSD/ports 509720head/lang/angelscript Makefile files, head/lang/angelscript/files patch-as_config.h

lang/angelscript: fix build on powerpc64

Angelscript works on powerpc, but its naming convention is only 32-bit. Define 
AS_MAX_PORTABILITY when building on powerpc64 to fix build.

PR:            239496
Approved by:    ndowens at yahoo.com (maintainer timeout), linimon (mentor)

NetBSD/src mI1RfjGsys/compat/linux/common linux_socket.h linux_socket.c

   Don't read data from userland directly. This simply does not work on any
   recent x86 CPU (thanks to SMAP) and all architectures that forbid direct
   access to userland from the kernel. But I guess no one noticed because no
   one ever uses compat_linux, right?

LLVM/llvm 369845cfe/trunk/lib/Frontend CompilerInvocation.cpp, cfe/trunk/tools/scan-build/bin scan-build

[analyzer] Analysis: Fix checker silencing

DragonFlyBSD/src 5f38e86sys/dev/drm/include/linux mm.h, sys/dev/drm/ttm ttm_bo_vm.c

drm/ttm: Partially sync the vm fault code with Linux

Prevent crashes with Mesa-using applications.

DragonFlyBSD/src 2f7844asys/dev/drm/include/linux mm_types.h mm.h

drm/linux: Move vm_area_struct definition to the right header

DragonFlyBSD/src d6f6f23sys/dev/drm/radeon radeon_cs.c

drm/radeon: Use mm->mmap_sem

DragonFlyBSD/src 0e32b8csys/dev/drm linux_sched.c drm_drv.c, sys/dev/drm/include/asm current.h

drm - Refactor task_struct and implement mm_struct

* Change td->td_linux_task from an embedded structure to a pointer.

* Add p->p_linux_mm to support tracking mm_struct's.

* Change the 'current' macro to test td->td_linux_task and call
  a support function, linux_task_alloc(), if it is NULL.

* Implement callbacks from the main kernel for thread exit and
  process exit to support functions that drop the td_linux_task and
  p_linux_mm pointers.

  Initialize and clear these callbacks in the module load/unload
  in drm_drv.c

* Implement required support functions in linux_sched.c

DragonFlyBSD/src d78d3a2sys/dev/drm/amd/include/asic_reg/dce dce_11_2_sh_mask.h dce_11_2_d.h, sys/dev/drm/radeon radeon_drv.h cik.c

drm/radeon: Update to Linux 4.7.10

* Various bugfixes, especially related to Displayport and
  vblank handling

* Sea Islands and Southern Islands GPUs support improvements

* Various quirks to fix problems for specific cards, mostly
  Radeon R7 370 and Radeon R9 270X models

NetBSD/src xTkUSLHsys/arch/arm/arm32 bus_dma.c

   bus_dmamap_load_raw: support coherent mappings
   bus_dmamap_sync: support syncing "raw" buffer types
VersionDeltaFile
1.116+9-7sys/arch/arm/arm32/bus_dma.c
+9-71 files

NetBSD/src ZvKevztsys/dev/pci pcidevs_data.h pcidevs.h

   regen
VersionDeltaFile
1.1372+3,101-3,091sys/dev/pci/pcidevs_data.h
1.1373+5-1sys/dev/pci/pcidevs.h
+3,106-3,0922 files