]> CyberLeo.Net >> Repos - FreeBSD/releng/10.0.git/log
FreeBSD/releng/10.0.git
10 years agoMerge r259173 from stable/10 (head r258758 by adrian):
gavin [Tue, 10 Dec 2013 19:14:19 +0000 (19:14 +0000)]
Merge r259173 from stable/10 (head r258758 by adrian):

  Make sure any waiters on the scan results get notified if the scan task
  decides to do nothing.

  If this isn't done, then a scan request whilst a scan occurs in an
  active channel set or a completed channel set will hang.

Approved by: re (glebius)

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259185 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

10 years agoMerge r259172 from stable/10 (head r257754 by adrian):
gavin [Tue, 10 Dec 2013 19:12:16 +0000 (19:12 +0000)]
Merge r259172 from stable/10 (head r257754 by adrian):

  Don't return ENOBUFS if the transmit path handles the frame but queues
  it (eg in power save.)

PR: kern/183727
Approved by: re (glebius)

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259184 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

10 years agoMFstable10 r259151:
gjb [Tue, 10 Dec 2013 17:26:52 +0000 (17:26 +0000)]
MFstable10 r259151:
  Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually
  passed to 'make release'.

Approved by: re (glebius)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259181 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

10 years agoRemove svn:mergeinfo from the releng/10.0 branch.
gjb [Mon, 9 Dec 2013 13:44:07 +0000 (13:44 +0000)]
Remove svn:mergeinfo from the releng/10.0 branch.

After branch creation from stable/10, the stable/10 branch mergeinfo
was moved to the root of the branch.

Since there have not been any merges from stable/10 to releng/10.0
yet, we do not need to track any of the existing mergeinfo here.

Merges to releng/10.0 should now be done to the root of the branch.

For future branches during the release cycle, unless otherwise noted,
this change will be done as part of the stable/ and releng/ branch
creation.

Discussed with: peter
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259128 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

10 years agoForced commit to mark the real -RC1 point.
gjb [Sat, 7 Dec 2013 13:03:14 +0000 (13:03 +0000)]
Forced commit to mark the real -RC1 point.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259068 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

10 years agoWhen stable/10 was branched from head/, __FreeBSD_version was bumped
gjb [Sat, 7 Dec 2013 12:57:38 +0000 (12:57 +0000)]
When stable/10 was branched from head/, __FreeBSD_version was bumped
to 1000500 from 1000055 when it should not have been bumped yet.

At the risk of having non-standard '5XX' __FreeBSD_version suffix
in a -RELEASE, bump __FreeBSD_version in releng/10.0 from 1000100
to 1000510 to prevent the value from going backwards as part of the
stable/10 -> releng/10.0 branch.

A commit to bump __FreeBSD_version in stable/10 will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259067 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

10 years ago- Copy stable/10 (r259064) to releng/10.0 as part of the
gjb [Sat, 7 Dec 2013 11:27:54 +0000 (11:27 +0000)]
- Copy stable/10 (r259064) to releng/10.0 as part of the
  10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
    start releng/10.0 at '100' so the branch is started with
    a value ending in zero.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259065 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f