Module Name: src
Committed By: msaitoh
Date: Thu Aug 8 03:20:17 UTC 2013
Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1 CHANGES-6.1.1
Log Message:
Remove the note about ticket #652 (bge) from CHANGES-6.1 because the change
wasn't added. Fixes PR#48069 for netbsd-6-1 branch.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.128 -r1.1.2.128.2.1 src/doc/CHANGES-6.1
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-6.1.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-6.1
diff -u src/doc/CHANGES-6.1:1.1.2.128 src/doc/CHANGES-6.1:1.1.2.128.2.1
--- src/doc/CHANGES-6.1:1.1.2.128 Sun May 12 23:51:22 2013
+++ src/doc/CHANGES-6.1 Thu Aug 8 03:20:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.128 2013/05/12 23:51:22 riz Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.128.2.1 2013/08/08 03:20:17 msaitoh Exp $
A complete list of changes from the 6.0 release until the 6.1 release:
@@ -651,14 +651,6 @@ dist/ipf/tools/ipmon_y.y patch
Fix alignment issues in ipmon. PR#47101.
[nakayama, ticket #651]
-sys/dev/mii/brgphy.c 1.60
-sys/dev/pci/if_bge.c 1.202
-sys/dev/pci/if_bgereg.h 1.57
-
- Add support for BCM57762 and BCM57765, found in Apple's Thunderbolt
- to Gigabit Ethernet adapter. PR kern/46961
- [tsutsui, ticket #652]
-
lib/libnpf/npf.c 1.14
usr.sbin/npf/npfctl/npf_var.h 1.5
@@ -9012,4 +9004,3 @@ sys/sys/param.h patched by hand
Welcome to 6.1!
[riz]
-
Index: src/doc/CHANGES-6.1.1
diff -u src/doc/CHANGES-6.1.1:1.1.2.16 src/doc/CHANGES-6.1.1:1.1.2.17
--- src/doc/CHANGES-6.1.1:1.1.2.16 Fri Aug 2 20:18:48 2013
+++ src/doc/CHANGES-6.1.1 Thu Aug 8 03:20:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.1,v 1.1.2.16 2013/08/02 20:18:48 martin Exp $
+# $NetBSD: CHANGES-6.1.1,v 1.1.2.17 2013/08/08 03:20:17 msaitoh Exp $
A complete list of changes from the NetBSD 6.1 release to the NetBSD 6.1.1
release:
@@ -174,3 +174,9 @@ sys/kern: uipc_socket.c 1.216
Fix an inversion in checking for authorization to drop TCP connections
found (and the obvious fix suggested) by Sander Bos.
[spz, ticket #927]
+
+doc/CHANGES-6.1 patch
+
+ Remove the note about ticket #652 (bge) because the change wasn't
+ added. Fixes PR#48069 for netbsd-6-1 branch.
+ [msaitoh]
