Module Name: src Committed By: pgoyette Date: Sat Aug 6 10:45:22 UTC 2016
Modified Files: src/sys/arch/x86/x86 [pgoyette-localcount]: pmap.c Log Message: Resolve $NetBSD$ conflict To generate a diff of this commit: cvs rdiff -u -r1.211.2.2 -r1.211.2.3 src/sys/arch/x86/x86/pmap.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/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.211.2.2 src/sys/arch/x86/x86/pmap.c:1.211.2.3 --- src/sys/arch/x86/x86/pmap.c:1.211.2.2 Sat Aug 6 00:19:06 2016 +++ src/sys/arch/x86/x86/pmap.c Sat Aug 6 10:45:22 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.211.2.2 2016/08/06 00:19:06 pgoyette Exp $ */ +/* $NetBSD: pmap.c,v 1.211.2.3 2016/08/06 10:45:22 pgoyette Exp $ */ /*- * Copyright (c) 2008, 2010, 2016 The NetBSD Foundation, Inc. @@ -171,11 +171,7 @@ */ #include <sys/cdefs.h> -<<<<<<< pmap.c -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.2 2016/08/06 00:19:06 pgoyette Exp $"); -======= -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.2 2016/08/06 00:19:06 pgoyette Exp $"); ->>>>>>> 1.218 +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.3 2016/08/06 10:45:22 pgoyette Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h"