[src/trunk]: src/sys Fix merge botches. I hope there's no more left...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8a0e65659443
branches:  trunk
changeset: 448245:8a0e65659443
user:      rin <rin%NetBSD.org@localhost>
date:      Sun Jan 27 09:19:36 2019 +0000

description:
Fix merge botches. I hope there's no more left...

diffstat:

 sys/dev/fdt/fdt_subr.c                                 |  6 ++----
 sys/rump/dev/lib/libscsipi/scsipi_component.c          |  7 ++-----
 sys/rump/dev/lib/libucom/ucom_at_usb.c                 |  7 ++-----
 sys/rump/dev/lib/libulpt/ulpt_at_usb.c                 |  7 ++-----
 sys/rump/dev/lib/libumass/umass_component.c            |  7 ++-----
 sys/rump/dev/lib/libwscons/wscons_component.c          |  7 ++-----
 sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c |  7 ++-----
 sys/rump/kern/lib/libsys_linux/linux_rump.c            |  7 ++-----
 sys/rump/kern/lib/libsys_linux/sys_linux_component.c   |  7 ++-----
 sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c   |  7 ++-----
 10 files changed, 20 insertions(+), 49 deletions(-)

diffs (164 lines):

diff -r f39f4e72fcc7 -r 8a0e65659443 sys/dev/fdt/fdt_subr.c
--- a/sys/dev/fdt/fdt_subr.c    Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/dev/fdt/fdt_subr.c    Sun Jan 27 09:19:36 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.25 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.26 2019/01/27 09:19:36 rin Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,9 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.25 2019/01/27 02:08:41 pgoyette Exp $");
-
-#include "opt_fdt.h"
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.26 2019/01/27 09:19:36 rin Exp $");
 
 #include "opt_fdt.h"
 
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/dev/lib/libscsipi/scsipi_component.c
--- a/sys/rump/dev/lib/libscsipi/scsipi_component.c     Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/dev/lib/libscsipi/scsipi_component.c     Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: scsipi_component.c,v 1.4 2019/01/27 02:08:48 pgoyette Exp $    */
+/*     $NetBSD: scsipi_component.c,v 1.5 2019/01/27 09:19:36 rin Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_component.c,v 1.4 2019/01/27 02:08:48 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_component.c,v 1.4 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_component.c,v 1.5 2019/01/27 09:19:36 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/dev/lib/libucom/ucom_at_usb.c
--- a/sys/rump/dev/lib/libucom/ucom_at_usb.c    Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/dev/lib/libucom/ucom_at_usb.c    Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: ucom_at_usb.c,v 1.10 2019/01/27 02:08:48 pgoyette Exp $        */
+/*     $NetBSD: ucom_at_usb.c,v 1.11 2019/01/27 09:19:37 rin Exp $     */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom_at_usb.c,v 1.10 2019/01/27 02:08:48 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom_at_usb.c,v 1.10 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom_at_usb.c,v 1.11 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/dev/lib/libulpt/ulpt_at_usb.c
--- a/sys/rump/dev/lib/libulpt/ulpt_at_usb.c    Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/dev/lib/libulpt/ulpt_at_usb.c    Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: ulpt_at_usb.c,v 1.8 2019/01/27 02:08:49 pgoyette Exp $ */
+/*     $NetBSD: ulpt_at_usb.c,v 1.9 2019/01/27 09:19:37 rin Exp $      */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt_at_usb.c,v 1.8 2019/01/27 02:08:49 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt_at_usb.c,v 1.8 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt_at_usb.c,v 1.9 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/dev/lib/libumass/umass_component.c
--- a/sys/rump/dev/lib/libumass/umass_component.c       Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/dev/lib/libumass/umass_component.c       Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: umass_component.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $     */
+/*     $NetBSD: umass_component.c,v 1.5 2019/01/27 09:19:37 rin Exp $  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_component.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_component.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_component.c,v 1.5 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/dev/lib/libwscons/wscons_component.c
--- a/sys/rump/dev/lib/libwscons/wscons_component.c     Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/dev/lib/libwscons/wscons_component.c     Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: wscons_component.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $    */
+/*     $NetBSD: wscons_component.c,v 1.5 2019/01/27 09:19:37 rin Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wscons_component.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wscons_component.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wscons_component.c,v 1.5 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c
--- a/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c    Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c    Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: sys_cygwin_component.c,v 1.5 2019/01/27 02:08:49 pgoyette Exp $        */
+/*     $NetBSD: sys_cygwin_component.c,v 1.6 2019/01/27 09:19:37 rin Exp $     */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_cygwin_component.c,v 1.5 2019/01/27 02:08:49 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_cygwin_component.c,v 1.5 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_cygwin_component.c,v 1.6 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/kern/lib/libsys_linux/linux_rump.c
--- a/sys/rump/kern/lib/libsys_linux/linux_rump.c       Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/kern/lib/libsys_linux/linux_rump.c       Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: linux_rump.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $  */
+/*     $NetBSD: linux_rump.c,v 1.5 2019/01/27 09:19:37 rin Exp $       */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_rump.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_rump.c,v 1.4 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_rump.c,v 1.5 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/kern/lib/libsys_linux/sys_linux_component.c
--- a/sys/rump/kern/lib/libsys_linux/sys_linux_component.c      Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/kern/lib/libsys_linux/sys_linux_component.c      Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: sys_linux_component.c,v 1.6 2019/01/27 02:08:49 pgoyette Exp $ */
+/*     $NetBSD: sys_linux_component.c,v 1.7 2019/01/27 09:19:37 rin Exp $      */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_linux_component.c,v 1.6 2019/01/27 02:08:49 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_linux_component.c,v 1.6 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_linux_component.c,v 1.7 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
diff -r f39f4e72fcc7 -r 8a0e65659443 sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c
--- a/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c      Sun Jan 27 09:07:23 2019 +0000
+++ b/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c      Sun Jan 27 09:19:36 2019 +0000
@@ -1,10 +1,7 @@
-/*     $NetBSD: sys_sunos_component.c,v 1.5 2019/01/27 02:08:49 pgoyette Exp $ */
+/*     $NetBSD: sys_sunos_component.c,v 1.6 2019/01/27 09:19:37 rin Exp $      */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_sunos_component.c,v 1.5 2019/01/27 02:08:49 pgoyette Exp $");
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_sunos_component.c,v 1.5 2019/01/27 02:08:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_sunos_component.c,v 1.6 2019/01/27 09:19:37 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>