diff options
| author | pgoyette <pgoyette@NetBSD.org> | 2019-01-27 02:08:33 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@NetBSD.org> | 2019-01-27 02:08:33 +0000 |
| commit | cc17ee2ece085d7d746bcd8fa9be19170855aaac (patch) | |
| tree | 5be40613f405cb081b2c44410b1506781927f8e3 /sys/external | |
| parent | 10dd4cc92542aa04b0e59469a484a48e4c3cdd24 (diff) | |
Merge the [pgoyette-compat] branch
Diffstat (limited to 'sys/external')
14 files changed, 35 insertions, 22 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c index 40e61a222bb..de279c0111e 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_bios.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: nouveau_bios.c,v 1.4 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright 2005-2006 Erik Waling @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_bios.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_bios.c,v 1.4 2019/01/27 02:08:42 pgoyette Exp $"); #include <drm/drmP.h> diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dma.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dma.c index d47bd75d8e5..f9a000816bb 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dma.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_dma.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: nouveau_dma.c,v 1.4 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright (C) 2007 Ben Skeggs. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_dma.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_dma.c,v 1.4 2019/01/27 02:08:42 pgoyette Exp $"); #include "nouveau_drm.h" #include "nouveau_dma.h" diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c index c64961190e4..7cd73f12b6e 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_gem.c,v 1.8 2018/08/27 15:22:54 riastradh Exp $ */ +/* $NetBSD: nouveau_gem.c,v 1.9 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright (C) 2008 Ben Skeggs. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.8 2018/08/27 15:22:54 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_gem.c,v 1.9 2019/01/27 02:08:42 pgoyette Exp $"); #include <linux/err.h> /* XXX */ diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fbcon.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fbcon.c index cb097ae7d6b..945b0210e80 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fbcon.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fbcon.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_nv04_fbcon.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: nouveau_nv04_fbcon.c,v 1.3 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright 2009 Ben Skeggs @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_nv04_fbcon.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_nv04_fbcon.c,v 1.3 2019/01/27 02:08:42 pgoyette Exp $"); #include "nouveau_drm.h" #include "nouveau_dma.h" diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fence.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fence.c index 5e7ece78b74..458a30df68a 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fence.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv04_fence.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_nv04_fence.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: nouveau_nv04_fence.c,v 1.3 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright 2012 Red Hat Inc. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_nv04_fence.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_nv04_fence.c,v 1.3 2019/01/27 02:08:42 pgoyette Exp $"); #include "nouveau_drm.h" #include "nouveau_dma.h" diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c index eebcddb4a1a..7694b8db864 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_nv10_fence.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: nouveau_nv10_fence.c,v 1.5 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright 2012 Red Hat Inc. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_nv10_fence.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_nv10_fence.c,v 1.5 2019/01/27 02:08:42 pgoyette Exp $"); #include "nouveau_drm.h" #include "nouveau_dma.h" diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c index ae7d4c0b250..a4f3b3762e7 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_nv84_fence.c,v 1.5 2018/08/27 07:38:42 riastradh Exp $ */ +/* $NetBSD: nouveau_nv84_fence.c,v 1.6 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright 2012 Red Hat Inc. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_nv84_fence.c,v 1.5 2018/08/27 07:38:42 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_nv84_fence.c,v 1.6 2019/01/27 02:08:42 pgoyette Exp $"); #include "nouveau_drm.h" #include "nouveau_dma.h" diff --git a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nvc0_fence.c b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nvc0_fence.c index 8e470cc2950..d983ebff977 100644 --- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nvc0_fence.c +++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nvc0_fence.c @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_nvc0_fence.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: nouveau_nvc0_fence.c,v 1.3 2019/01/27 02:08:42 pgoyette Exp $ */ /* * Copyright 2012 Red Hat Inc. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nouveau_nvc0_fence.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_nvc0_fence.c,v 1.3 2019/01/27 02:08:42 pgoyette Exp $"); #include "nouveau_drm.h" #include "nouveau_dma.h" diff --git a/sys/external/bsd/drm2/i915drm/files.i915drmkms b/sys/external/bsd/drm2/i915drm/files.i915drmkms index d76af99a85d..64750cd217e 100644 --- a/sys/external/bsd/drm2/i915drm/files.i915drmkms +++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms @@ -1,4 +1,6 @@ -# $NetBSD: files.i915drmkms,v 1.34 2019/01/19 16:58:29 dholland Exp $ +# $NetBSD: files.i915drmkms,v 1.35 2019/01/27 02:08:42 pgoyette Exp $ + +version 20180827 version 20180827 diff --git a/sys/external/bsd/drm2/include/linux/atomic.h b/sys/external/bsd/drm2/include/linux/atomic.h index 9fce660fea9..576efa2e57a 100644 --- a/sys/external/bsd/drm2/include/linux/atomic.h +++ b/sys/external/bsd/drm2/include/linux/atomic.h @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.h,v 1.19 2018/08/27 15:11:17 riastradh Exp $ */ +/* $NetBSD: atomic.h,v 1.20 2019/01/27 02:08:43 pgoyette Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. diff --git a/sys/external/bsd/drm2/nouveau/files.nouveau b/sys/external/bsd/drm2/nouveau/files.nouveau index 5fc60890526..8d60f814f6e 100644 --- a/sys/external/bsd/drm2/nouveau/files.nouveau +++ b/sys/external/bsd/drm2/nouveau/files.nouveau @@ -1,4 +1,6 @@ -# $NetBSD: files.nouveau,v 1.23 2018/10/14 17:25:21 riastradh Exp $ +# $NetBSD: files.nouveau,v 1.24 2019/01/27 02:08:43 pgoyette Exp $ + +version 20180827 version 20180827 diff --git a/sys/external/bsd/drm2/radeon/files.radeon b/sys/external/bsd/drm2/radeon/files.radeon index 3c39b1b76e9..9d2164005ed 100644 --- a/sys/external/bsd/drm2/radeon/files.radeon +++ b/sys/external/bsd/drm2/radeon/files.radeon @@ -1,4 +1,6 @@ -# $NetBSD: files.radeon,v 1.22 2018/09/21 11:31:50 kamil Exp $ +# $NetBSD: files.radeon,v 1.23 2019/01/27 02:08:43 pgoyette Exp $ + +version 20180827 version 20180827 diff --git a/sys/external/bsd/gnu-efi/dist/lib/print.c b/sys/external/bsd/gnu-efi/dist/lib/print.c index ea5c8503bea..cff751f4cc3 100644 --- a/sys/external/bsd/gnu-efi/dist/lib/print.c +++ b/sys/external/bsd/gnu-efi/dist/lib/print.c @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.2 2018/08/19 14:50:24 jmcneill Exp $ */ +/* $NetBSD: print.c,v 1.3 2019/01/27 02:08:43 pgoyette Exp $ */ /*++ @@ -532,6 +532,7 @@ Returns: _PoolCatPrint (fmt, args, &spc, _PoolPrint); return spc.str; } +>>>>>>> 1.1.1.1.34.1 CHAR16 * PoolPrint ( diff --git a/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h b/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h index 10d3585bd38..a534190f278 100644 --- a/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h +++ b/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h @@ -1,4 +1,10 @@ -/* $NetBSD: stm32-pinfunc.h,v 1.1.1.2 2018/04/28 18:25:53 jmcneill Exp $ */ +/* $NetBSD: stm32-pinfunc.h,v 1.2 2019/01/27 02:08:43 pgoyette Exp $ */ + +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) STMicroelectronics 2017 - All Rights Reserved + * Author: Torgue Alexandre <alexandre.torgue@st.com> for STMicroelectronics. + */ /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ /* |
