[src/tls-maxphys]: src/sys/ufs/ufs remove rebase merge artifacts

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

details:   https://anonhg.NetBSD.org/src/rev/b43b95afafd5
branches:  tls-maxphys
changeset: 852978:b43b95afafd5
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Oct 24 22:27:42 2017 +0000

description:
remove rebase merge artifacts

diffstat:

 sys/ufs/ufs/ufs_vfsops.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 0d0df52cc367 -r b43b95afafd5 sys/ufs/ufs/ufs_vfsops.c
--- a/sys/ufs/ufs/ufs_vfsops.c  Tue Aug 19 23:55:11 2014 +0000
+++ b/sys/ufs/ufs/ufs_vfsops.c  Tue Oct 24 22:27:42 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_vfsops.c,v 1.51.2.3 2014/08/20 00:04:45 tls Exp $  */
+/*     $NetBSD: ufs_vfsops.c,v 1.51.2.4 2017/10/24 22:27:42 jdolecek Exp $     */
 
 /*
  * Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.51.2.3 2014/08/20 00:04:45 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vfsops.c,v 1.51.2.4 2017/10/24 22:27:42 jdolecek Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -99,7 +99,6 @@
 }
 
 /*
-<<<<<<< ufs_vfsops.c
  * Get (from disk) and set (to mount structure) maximum I/O size
  */
 
@@ -130,7 +129,6 @@
 }
 
 /*
-=======
  * Look up and return a vnode/inode pair by inode number.
  */
 int
@@ -151,7 +149,6 @@
 }
 
 /*
->>>>>>> 1.53
  * Do operations associated with quotas
  */
 int