Module Name: src
Committed By: rin
Date: Sun Jan 27 09:19:37 UTC 2019
Modified Files:
src/sys/dev/fdt: fdt_subr.c
src/sys/rump/dev/lib/libscsipi: scsipi_component.c
src/sys/rump/dev/lib/libucom: ucom_at_usb.c
src/sys/rump/dev/lib/libulpt: ulpt_at_usb.c
src/sys/rump/dev/lib/libumass: umass_component.c
src/sys/rump/dev/lib/libwscons: wscons_component.c
src/sys/rump/kern/lib/libsys_cygwin: sys_cygwin_component.c
src/sys/rump/kern/lib/libsys_linux: linux_rump.c sys_linux_component.c
src/sys/rump/kern/lib/libsys_sunos: sys_sunos_component.c
Log Message:
Fix merge botches. I hope there's no more left...
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/fdt/fdt_subr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libscsipi/scsipi_component.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libumass/umass_component.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libwscons/wscons_component.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libsys_linux/linux_rump.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/rump/kern/lib/libsys_linux/sys_linux_component.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.25 src/sys/dev/fdt/fdt_subr.c:1.26
--- src/sys/dev/fdt/fdt_subr.c:1.25 Sun Jan 27 02:08:41 2019
+++ src/sys/dev/fdt/fdt_subr.c Sun Jan 27 09:19:36 2019
@@ -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 <[email protected]>
@@ -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"
Index: src/sys/rump/dev/lib/libscsipi/scsipi_component.c
diff -u src/sys/rump/dev/lib/libscsipi/scsipi_component.c:1.4 src/sys/rump/dev/lib/libscsipi/scsipi_component.c:1.5
--- src/sys/rump/dev/lib/libscsipi/scsipi_component.c:1.4 Sun Jan 27 02:08:48 2019
+++ src/sys/rump/dev/lib/libscsipi/scsipi_component.c Sun Jan 27 09:19:36 2019
@@ -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>
Index: src/sys/rump/dev/lib/libucom/ucom_at_usb.c
diff -u src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.10 src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.11
--- src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.10 Sun Jan 27 02:08:48 2019
+++ src/sys/rump/dev/lib/libucom/ucom_at_usb.c Sun Jan 27 09:19:37 2019
@@ -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>
Index: src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
diff -u src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.8 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.9
--- src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.8 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c Sun Jan 27 09:19:37 2019
@@ -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>
Index: src/sys/rump/dev/lib/libumass/umass_component.c
diff -u src/sys/rump/dev/lib/libumass/umass_component.c:1.4 src/sys/rump/dev/lib/libumass/umass_component.c:1.5
--- src/sys/rump/dev/lib/libumass/umass_component.c:1.4 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/dev/lib/libumass/umass_component.c Sun Jan 27 09:19:37 2019
@@ -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>
Index: src/sys/rump/dev/lib/libwscons/wscons_component.c
diff -u src/sys/rump/dev/lib/libwscons/wscons_component.c:1.4 src/sys/rump/dev/lib/libwscons/wscons_component.c:1.5
--- src/sys/rump/dev/lib/libwscons/wscons_component.c:1.4 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/dev/lib/libwscons/wscons_component.c Sun Jan 27 09:19:37 2019
@@ -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>
Index: src/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c
diff -u src/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c:1.5 src/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c:1.6
--- src/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c:1.5 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c Sun Jan 27 09:19:37 2019
@@ -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>
Index: src/sys/rump/kern/lib/libsys_linux/linux_rump.c
diff -u src/sys/rump/kern/lib/libsys_linux/linux_rump.c:1.4 src/sys/rump/kern/lib/libsys_linux/linux_rump.c:1.5
--- src/sys/rump/kern/lib/libsys_linux/linux_rump.c:1.4 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/kern/lib/libsys_linux/linux_rump.c Sun Jan 27 09:19:37 2019
@@ -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>
Index: src/sys/rump/kern/lib/libsys_linux/sys_linux_component.c
diff -u src/sys/rump/kern/lib/libsys_linux/sys_linux_component.c:1.6 src/sys/rump/kern/lib/libsys_linux/sys_linux_component.c:1.7
--- src/sys/rump/kern/lib/libsys_linux/sys_linux_component.c:1.6 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/kern/lib/libsys_linux/sys_linux_component.c Sun Jan 27 09:19:37 2019
@@ -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>
Index: src/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c
diff -u src/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c:1.5 src/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c:1.6
--- src/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c:1.5 Sun Jan 27 02:08:49 2019
+++ src/sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c Sun Jan 27 09:19:37 2019
@@ -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>
