Module Name: src Committed By: martin Date: Fri Aug 9 15:59:53 UTC 2019
Modified Files: src/sys/arch/amd64/conf [netbsd-9]: ALL GENERIC XEN3_DOM0 src/sys/arch/i386/conf [netbsd-9]: GENERIC XEN3PAE_DOM0 Log Message: Pull up following revision(s) (requested by rin in ticket #35): sys/arch/amd64/conf/ALL: revision 1.121 sys/arch/i386/conf/XEN3PAE_DOM0: revision 1.14 sys/arch/amd64/conf/XEN3_DOM0: revision 1.168 sys/arch/i386/conf/GENERIC: revision 1.1210 sys/arch/amd64/conf/GENERIC: revision 1.534 xhci(4) is considered stable enough. So, remove misleading comments. XXX pullup to netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.120.2.1 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.531 -r1.531.2.1 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.167 -r1.167.2.1 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.1208 -r1.1208.2.1 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/i386/conf/XEN3PAE_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.120 src/sys/arch/amd64/conf/ALL:1.120.2.1 --- src/sys/arch/amd64/conf/ALL:1.120 Wed Jul 24 23:13:46 2019 +++ src/sys/arch/amd64/conf/ALL Fri Aug 9 15:59:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.120 2019/07/24 23:13:46 tnn Exp $ +# $NetBSD: ALL,v 1.120.2.1 2019/08/09 15:59:52 martin Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.120 $" +#ident "ALL-$Revision: 1.120.2.1 $" maxusers 64 # estimated number of users @@ -1124,7 +1124,6 @@ urlphy* at mii? phy ? # Realtek RTL815 # PCI USB controllers xhci* at pci? dev ? function ? # eXtensible Host Controller - # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.531 src/sys/arch/amd64/conf/GENERIC:1.531.2.1 --- src/sys/arch/amd64/conf/GENERIC:1.531 Wed Jul 24 06:35:04 2019 +++ src/sys/arch/amd64/conf/GENERIC Fri Aug 9 15:59:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.531 2019/07/24 06:35:04 msaitoh Exp $ +# $NetBSD: GENERIC,v 1.531.2.1 2019/08/09 15:59:52 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.531 $" +#ident "GENERIC-$Revision: 1.531.2.1 $" maxusers 64 # estimated number of users @@ -894,7 +894,6 @@ urlphy* at mii? phy ? # Realtek RTL815 # PCI USB controllers xhci* at pci? dev ? function ? # eXtensible Host Controller - # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.167 src/sys/arch/amd64/conf/XEN3_DOM0:1.167.2.1 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.167 Mon May 6 02:24:37 2019 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Aug 9 15:59:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.167 2019/05/06 02:24:37 sevan Exp $ +# $NetBSD: XEN3_DOM0,v 1.167.2.1 2019/08/09 15:59:52 martin Exp $ include "arch/amd64/conf/std.xen" @@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.167 $" +#ident "XEN3_DOM0-$Revision: 1.167.2.1 $" maxusers 32 # estimated number of users @@ -570,7 +570,6 @@ wsmouse* at pms? mux 0 # PCI USB controllers xhci* at pci? dev ? function ? # eXtensible Host Controller - # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1208 src/sys/arch/i386/conf/GENERIC:1.1208.2.1 --- src/sys/arch/i386/conf/GENERIC:1.1208 Mon Jun 17 19:01:17 2019 +++ src/sys/arch/i386/conf/GENERIC Fri Aug 9 15:59:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1208 2019/06/17 19:01:17 kamil Exp $ +# $NetBSD: GENERIC,v 1.1208.2.1 2019/08/09 15:59:52 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1208 $" +#ident "GENERIC-$Revision: 1.1208.2.1 $" maxusers 64 # estimated number of users @@ -1140,7 +1140,6 @@ urlphy* at mii? phy ? # Realtek RTL815 # PCI USB controllers xhci* at pci? dev ? function ? # eXtensible Host Controller - # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC) ohci* at pci? dev ? function ? # Open Host Controller Index: src/sys/arch/i386/conf/XEN3PAE_DOM0 diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.13 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.13.4.1 --- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.13 Mon Feb 11 14:59:32 2019 +++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Fri Aug 9 15:59:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOM0,v 1.13 2019/02/11 14:59:32 cherry Exp $ +# $NetBSD: XEN3PAE_DOM0,v 1.13.4.1 2019/08/09 15:59:52 martin Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -547,7 +547,6 @@ wsmouse* at pms? mux 0 # PCI USB controllers xhci* at pci? dev ? function ? # eXtensible Host Controller - # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel)