[PC-BSD Commits] [pcbsd/freebsd] bb9998: MFC 253176, 253179: make sure the rxbuf->flags is c...

GitHub noreply at github.com
Tue Aug 20 13:09:48 PDT 2013


  Branch: refs/heads/releng/9.2
  Home:   https://github.com/pcbsd/freebsd
  Commit: bb9998a8f7462567e52e336186a51e51dcf6a0a3
      https://github.com/pcbsd/freebsd/commit/bb9998a8f7462567e52e336186a51e51dcf6a0a3
  Author: jfv <jfv at FreeBSD.org>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M sys/dev/ixgbe/ixgbe.c

  Log Message:
  -----------
  MFC 253176,253179: make sure the rxbuf->flags is cleared when the RX ring is reset

Approved by: re


  Commit: a2d054318c6fd38a40ca8642db4cc8226050336e
      https://github.com/pcbsd/freebsd/commit/a2d054318c6fd38a40ca8642db4cc8226050336e
  Author: hrs <hrs at FreeBSD.org>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M sys/dev/filemon/filemon.c
    M sys/dev/filemon/filemon_wrapper.c

  Log Message:
  -----------
  MFC 253887,253977:

- Use pget(PGET_CANDEBUG | PGET_NOTWEXIT) to determine if the specified
  PID is valid for monitoring in FILEMON_SET_PID ioctl.

- Set the monitored PID to -1 when the process exits.

Suggested by:	jilles
Tested by:	sjg
Approved by:	re (kib)


  Commit: 669d8f4b146f543e05d6b237acbe1b78ff7d2112
      https://github.com/pcbsd/freebsd/commit/669d8f4b146f543e05d6b237acbe1b78ff7d2112
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M usr.sbin/bsdconfig/include/messages.subr
    M usr.sbin/bsdconfig/share/media/ftp.subr

  Log Message:
  -----------
  Sync-up bsdinstall(8)/bsdconfig(8) list of mirrors.

SVN r253543:
Update mirror list to more closely match
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html

SVN r253545:
Sync-up with bsdinstall(8) FTP mirrorselect changes.

SVN r253566:
Remove ftp2.tr.freebsd.org, it is out of date.

Reviewed by:	gavin
Approved by:	re (glebius)


  Commit: dd192b8fe7e4bb42c337847cd819e586add9150a
      https://github.com/pcbsd/freebsd/commit/dd192b8fe7e4bb42c337847cd819e586add9150a
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M usr.sbin/bsdinstall/scripts/mirrorselect

  Log Message:
  -----------
  Sync-up bsdinstall(8)/bsdconfig(8) list of mirrors.

SVN r253543:
Update mirror list to more closely match
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html

SVN r253545:
Sync-up with bsdinstall(8) FTP mirrorselect changes.

SVN r253566:
Remove ftp2.tr.freebsd.org, it is out of date.

Reviewed by:	gavin
Approved by:	re (glebius)


  Commit: f908f30b1d62f847adec15869d4ee502977dcd0a
      https://github.com/pcbsd/freebsd/commit/f908f30b1d62f847adec15869d4ee502977dcd0a
  Author: marcel <marcel at FreeBSD.org>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M release/ia64/mkisoimages.sh

  Log Message:
  -----------
  Merge r254075 from stable/9. This fixes the ISO images.

Approved by:	re (gjb@)


  Commit: 84119a2a866f31375c6d5465bb95da039e6f2b0d
      https://github.com/pcbsd/freebsd/commit/84119a2a866f31375c6d5465bb95da039e6f2b0d
  Author: theraven <theraven at FreeBSD.org>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M contrib/libcxxrt/unwind-itanium.h

  Log Message:
  -----------
  Merge alignment fix for libcxxrt header.

Approved by:	re


  Commit: f84e542051038778b6aef9ac452048e6fdf257c0
      https://github.com/pcbsd/freebsd/commit/f84e542051038778b6aef9ac452048e6fdf257c0
  Author: jfv <jfv at FreeBSD.org>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M sys/modules/ixgbe/Makefile

  Log Message:
  -----------
  Automate inet option file creation for module build, change module name to
if_ixgbe, this sync's the Makefile with HEAD.

Approved by:	re


  Commit: 6ede9411042501150a81d606847a2d511f7e6c54
      https://github.com/pcbsd/freebsd/commit/6ede9411042501150a81d606847a2d511f7e6c54
  Author: marius <marius at FreeBSD.org>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M sys/dev/aac/aac_pci.c
    M sys/dev/aac/aacvar.h

  Log Message:
  -----------
  MFC: r254004

As it turns out, MSIs are broken with 2820SA so introduce an AAC_FLAGS_NOMSI
quirk and apply it to these controllers [1]. The same problem was reported
for 2230S, in which case it wasn't actually clear whether the culprit is the
controller or the mainboard, though. In order to be on the safe side, flag
MSIs as being broken with the latter type of controller as well. Given that
these are the only reports of MSI-related breakage with aac(4) so far and
OSes like OpenSolaris unconditionally employ MSIs for all adapters of this
family, however, it doesn't seem warranted to generally disable the use of
MSIs in aac(4).
While at it, simplify the MSI allocation logic a bit; there's no need to
check for the presence of the MSI capability on our own as pci_alloc_msi(9)
will just fail when these kind of interrupts are not available.
Reported and tested by: David Boyd [1]

Approved by:	re (kib)


  Commit: 93b011e50a30a0e96e28f428803033d70eedbb3e
      https://github.com/pcbsd/freebsd/commit/93b011e50a30a0e96e28f428803033d70eedbb3e
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M sys/boot/common/Makefile.inc
    M sys/boot/forth/beastie.4th
    M sys/boot/forth/beastie.4th.8
    M sys/boot/forth/brand.4th
    M sys/boot/forth/brand.4th.8
    M sys/boot/forth/check-password.4th
    M sys/boot/forth/check-password.4th.8
    M sys/boot/forth/color.4th
    M sys/boot/forth/color.4th.8
    M sys/boot/forth/delay.4th
    M sys/boot/forth/delay.4th.8
    M sys/boot/forth/frames.4th
    M sys/boot/forth/loader.4th
    M sys/boot/forth/loader.4th.8
    M sys/boot/forth/loader.conf
    M sys/boot/forth/loader.conf.5
    M sys/boot/forth/loader.rc
    M sys/boot/forth/menu-commands.4th
    M sys/boot/forth/menu.4th
    M sys/boot/forth/menu.4th.8
    M sys/boot/forth/menu.rc
    A sys/boot/forth/menusets.4th
    A sys/boot/forth/menusets.4th.8
    M sys/boot/forth/shortcuts.4th
    M sys/boot/forth/support.4th
    M sys/boot/forth/version.4th
    M sys/boot/forth/version.4th.8
    M sys/boot/i386/loader/Makefile
    M sys/boot/ia64/common/Makefile
    M sys/boot/pc98/loader/Makefile
    M sys/boot/powerpc/ofw/Makefile
    M sys/boot/powerpc/ps3/Makefile
    M sys/boot/sparc64/loader/Makefile

  Log Message:
  -----------
  Synchronize releng/9.2 Forth code with stable/9 via MFS of 2 revisions:

First, MFS of SVN r254109: itself an MFC of 22 revisions:
227727, 233941, 235560, 238431, 241310, 241361, 241363, 241365, 241367,
241523, 242667-242669, 242923, 243114, 243660, 244048, 244089, 244158,
253715, 254105, and 254108.

This includes critical fixes that sadly should have been merged prior.
Namely, SVN r244158 fixes a possible regression.

Second, MFS of SVN r254146: Itself an MFC of r242688.

Approved by:	re (marius)


  Commit: 0a18db6f62803cbccb79772ec3210c4011de5510
      https://github.com/pcbsd/freebsd/commit/0a18db6f62803cbccb79772ec3210c4011de5510
  Author: erwin <erwin at FreeBSD.org>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M etc/namedb/named.conf

  Log Message:
  -----------
  MFC 254132, 254270:
  Add empty zones for Shared Address Space (RFC 6598)

Approved by:  re (glebius), delphij (mentor)
Sponsored by: DK Hostmaster A/S


  Commit: d02587d9f7f526efb072bc4b3f5dc0a302a42ad6
      https://github.com/pcbsd/freebsd/commit/d02587d9f7f526efb072bc4b3f5dc0a302a42ad6
  Author: gshapiro <gshapiro at FreeBSD.org>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M contrib/sendmail/include/sm/os/sm_os_freebsd.h

  Log Message:
  -----------
  MFC: Temporarily revert sendmail 8.14.7 change to getipnodebyname() flags
     to prevent problems between the resolver and Microsoft DNS servers with
     AAAA lookups.  The upstream open source project will work on a more
     permanent fix for the next release.  Issue noted by Pavel Timofeev.

Approved by:	re (glebius)


  Commit: 1f9c68d31fdf65e13e10322cb327682bf4fec1e2
      https://github.com/pcbsd/freebsd/commit/1f9c68d31fdf65e13e10322cb327682bf4fec1e2
  Author: tuexen <tuexen at FreeBSD.org>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M sys/netinet/sctp_output.c

  Log Message:
  -----------
  MFC r254352:
Don't send uninitialized memory (two instances of 4 bytes) in
every cookie on the wire. This bug was reported in
https://bugzilla.mozilla.org/show_bug.cgi?id=905080

Approved by:	re@


  Commit: 7fd43b7573d91af016e16b55e4414314e0bd4c1f
      https://github.com/pcbsd/freebsd/commit/7fd43b7573d91af016e16b55e4414314e0bd4c1f
  Author: jlh <jlh at FreeBSD.org>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M etc/Makefile
    A etc/libmap.conf

  Log Message:
  -----------
  MFC r253853:
  Include /usr/local/etc/libmap.d/ by default.

  PR:             180568
  Reviewed by:    bapt
  Obtained from:  kib

Approved by:      re (delphij)


  Commit: f096022b08b7397d347041d6dc16c473351691da
      https://github.com/pcbsd/freebsd/commit/f096022b08b7397d347041d6dc16c473351691da
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M usr.sbin/bsdinstall/scripts/mirrorselect

  Log Message:
  -----------
  MFC r254265:
 Make sure bootonly.iso for -BETAs and -RCs use the releases/
 directory on the FTP mirrors to fetch distributions, since
 these are always pushed to releases/ during the release cycle.

Approved by:	re (marius)


  Commit: 88f5b0f11a81dfafa1699d5372fd77cbda986f91
      https://github.com/pcbsd/freebsd/commit/88f5b0f11a81dfafa1699d5372fd77cbda986f91
  Author: scottl <scottl at FreeBSD.org>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M sys/dev/aacraid/aacraid_pci.c
    M sys/dev/advansys/adw_pci.c
    M sys/dev/aic7xxx/ahc_pci.c
    M sys/dev/aic7xxx/ahd_pci.c
    M sys/dev/amr/amr_pci.c
    M sys/dev/an/if_an_pci.c
    M sys/dev/arcmsr/arcmsr.c
    M sys/dev/asr/asr.c
    M sys/dev/ata/ata-pci.c
    M sys/dev/bktr/bktr_os.c
    M sys/dev/buslogic/bt_pci.c
    M sys/dev/dpt/dpt_pci.c
    M sys/dev/e1000/if_em.c
    M sys/dev/e1000/if_igb.c
    M sys/dev/e1000/if_lem.c
    M sys/dev/fatm/if_fatm.c
    M sys/dev/firewire/fwohci_pci.c
    M sys/dev/fxp/if_fxp.c
    M sys/dev/hatm/if_hatm.c
    M sys/dev/ida/ida_pci.c
    M sys/dev/ips/ips_pci.c
    M sys/dev/isp/isp_pci.c
    M sys/dev/iwn/if_iwn.c
    M sys/dev/ixgb/if_ixgb.c
    M sys/dev/ixgbe/ixv.c
    M sys/dev/mfi/mfi_pci.c
    M sys/dev/mlx/mlx_pci.c
    M sys/dev/mly/mly.c
    M sys/dev/mn/if_mn.c
    M sys/dev/mps/mps_pci.c
    M sys/dev/mpt/mpt_pci.c
    M sys/dev/mwl/if_mwl_pci.c
    M sys/dev/mxge/if_mxge.c
    M sys/dev/pccbb/pccbb_pci.c
    M sys/dev/pst/pst-pci.c
    M sys/dev/rp/rp_pci.c
    M sys/dev/safe/safe.c
    M sys/dev/sound/pci/als4000.c
    M sys/dev/sound/pci/aureal.c
    M sys/dev/sound/pci/cmi.c
    M sys/dev/sound/pci/cs4281.c
    M sys/dev/sound/pci/csa.c
    M sys/dev/sound/pci/ds1.c
    M sys/dev/sound/pci/emu10k1.c
    M sys/dev/sound/pci/emu10kx.c
    M sys/dev/sound/pci/envy24.c
    M sys/dev/sound/pci/envy24ht.c
    M sys/dev/sound/pci/es137x.c
    M sys/dev/sound/pci/fm801.c
    M sys/dev/sound/pci/hdspe.c
    M sys/dev/sound/pci/maestro.c
    M sys/dev/sound/pci/maestro3.c
    M sys/dev/sound/pci/neomagic.c
    M sys/dev/sound/pci/solo.c
    M sys/dev/sound/pci/t4dwave.c
    M sys/dev/sound/pci/via82c686.c
    M sys/dev/sound/pci/vibes.c
    M sys/dev/stge/if_stge.c
    M sys/dev/sym/sym_hipd.c
    M sys/dev/tdfx/tdfx_pci.c
    M sys/dev/twa/tw_osl_freebsd.c
    M sys/dev/tws/tws.c
    M sys/dev/ubsec/ubsec.c
    M sys/dev/wi/if_wi_pci.c
    M sys/pci/ncr.c

  Log Message:
  -----------
   Merge r254306:

 Update PCI drivers to no longer look at the MEMIO-enabled bit in the PCI
 command register.  The lazy BAR allocation code in FreeBSD sometimes
 disables this bit when it detects a range conflict, and will re-enable
 it on demand when a driver allocates the BAR.  Thus, the bit is no longer
 a reliable indication of capability, and should not be checked.  This
 results in the elimination of a lot of code from drivers, and also gives
 the opportunity to simplify a lot of drivers to use a helper API to set
 the busmaster enable bit.

 This changes fixes some recent reports of disk controllers and their
 associated drives/enclosures disappearing during boot.

Submitted by:	jhb
Reviewed by:	jfv, marius, adrian, achim
Approved by:	re


  Commit: 6489342c5c52e7fa3f3d9a669f24a321650605c0
      https://github.com/pcbsd/freebsd/commit/6489342c5c52e7fa3f3d9a669f24a321650605c0
  Author: ae <ae at FreeBSD.org>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M sys/boot/common/part.c

  Log Message:
  -----------
  Merge r254366:
  Make the check for number of entries less strict.
  Some partitioning tools can create GPT with number of entries less
  than 128.

Approved by:	re (marius)


  Commit: 622a372a5bcf723992d24da58dd4d377476be895
      https://github.com/pcbsd/freebsd/commit/622a372a5bcf723992d24da58dd4d377476be895
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M release/Makefile.sysinstall
    M sys/conf/newvers.sh

  Log Message:
  -----------
  Update releng/9.2 to -RC2.

Approved by:	re (implicit)


  Commit: ae34e8ba5f729b909715bc60e8c3e05689330803
      https://github.com/pcbsd/freebsd/commit/ae34e8ba5f729b909715bc60e8c3e05689330803
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M sys/boot/forth/beastie.4th

  Log Message:
  -----------
  MFS9 SVN r254331:
Add optional support for default override of standard setup; but only if
corresponding functions are provided. If override function does not exist,
boot remains unmodified. This patch should not result in any changes.

This includes changes to take advantage of the new functionality.

Approved by:	re (marius)


  Commit: 12761ca36997709b8bf6bec10543135dc2d03746
      https://github.com/pcbsd/freebsd/commit/12761ca36997709b8bf6bec10543135dc2d03746
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M usr.sbin/pkg_install/add/main.c

  Log Message:
  -----------
  MFC r254525:
 Add entry for packages-9.2-release directory.

Approved by:	re (implicit)


  Commit: 70e48419c0ea1e741837ffce90731959d0e7cbb9
      https://github.com/pcbsd/freebsd/commit/70e48419c0ea1e741837ffce90731959d0e7cbb9
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M usr.sbin/makefs/makefs.8
    M usr.sbin/makefs/makefs.c

  Log Message:
  -----------
  MFC r254397:
  Mark the makefs(8) '-p' flag as deprecated in preference for
  the '-Z' flag for compatibility with NetBSD.

Approved by:	re (rodrigc)


  Commit: 002b945b16737a4fa37e81439321e43ad4f89704
      https://github.com/pcbsd/freebsd/commit/002b945b16737a4fa37e81439321e43ad4f89704
  Author: jfv <jfv at FreeBSD.org>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M sys/dev/e1000/if_em.c
    M sys/dev/e1000/if_igb.c
    M sys/dev/ixgbe/ixgbe.c
    M sys/dev/ixgbe/ixv.c

  Log Message:
  -----------
  MFC r254008,254262:  Improve the MSIX setup logic, making sure the requested
number of vectors are actually obtained, and if not cleaning up before falling
back to MSI. Also make the fallback decision as early as possible.

Approved by: re


  Commit: 793915cded83c7f353a36e4826e24c239f49dc76
      https://github.com/pcbsd/freebsd/commit/793915cded83c7f353a36e4826e24c239f49dc76
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M contrib/libcxxrt/unwind-itanium.h
    M contrib/sendmail/include/sm/os/sm_os_freebsd.h
    M etc/Makefile
    A etc/libmap.conf
    M etc/namedb/named.conf
    M release/Makefile.sysinstall
    M release/ia64/mkisoimages.sh
    M sys/boot/common/Makefile.inc
    M sys/boot/common/part.c
    M sys/boot/forth/beastie.4th
    M sys/boot/forth/beastie.4th.8
    M sys/boot/forth/brand.4th
    M sys/boot/forth/brand.4th.8
    M sys/boot/forth/check-password.4th
    M sys/boot/forth/check-password.4th.8
    M sys/boot/forth/color.4th
    M sys/boot/forth/color.4th.8
    M sys/boot/forth/delay.4th
    M sys/boot/forth/delay.4th.8
    M sys/boot/forth/frames.4th
    M sys/boot/forth/loader.4th
    M sys/boot/forth/loader.4th.8
    M sys/boot/forth/loader.conf
    M sys/boot/forth/loader.conf.5
    M sys/boot/forth/loader.rc
    M sys/boot/forth/menu-commands.4th
    M sys/boot/forth/menu.4th
    M sys/boot/forth/menu.4th.8
    M sys/boot/forth/menu.rc
    A sys/boot/forth/menusets.4th
    A sys/boot/forth/menusets.4th.8
    M sys/boot/forth/shortcuts.4th
    M sys/boot/forth/support.4th
    M sys/boot/forth/version.4th
    M sys/boot/forth/version.4th.8
    M sys/boot/i386/loader/Makefile
    M sys/boot/ia64/common/Makefile
    M sys/boot/pc98/loader/Makefile
    M sys/boot/powerpc/ofw/Makefile
    M sys/boot/powerpc/ps3/Makefile
    M sys/boot/sparc64/loader/Makefile
    M sys/conf/newvers.sh
    M sys/dev/aac/aac_pci.c
    M sys/dev/aac/aacvar.h
    M sys/dev/aacraid/aacraid_pci.c
    M sys/dev/advansys/adw_pci.c
    M sys/dev/aic7xxx/ahc_pci.c
    M sys/dev/aic7xxx/ahd_pci.c
    M sys/dev/amr/amr_pci.c
    M sys/dev/an/if_an_pci.c
    M sys/dev/arcmsr/arcmsr.c
    M sys/dev/asr/asr.c
    M sys/dev/ata/ata-pci.c
    M sys/dev/bktr/bktr_os.c
    M sys/dev/buslogic/bt_pci.c
    M sys/dev/dpt/dpt_pci.c
    M sys/dev/e1000/if_em.c
    M sys/dev/e1000/if_igb.c
    M sys/dev/e1000/if_lem.c
    M sys/dev/fatm/if_fatm.c
    M sys/dev/filemon/filemon.c
    M sys/dev/filemon/filemon_wrapper.c
    M sys/dev/firewire/fwohci_pci.c
    M sys/dev/fxp/if_fxp.c
    M sys/dev/hatm/if_hatm.c
    M sys/dev/ida/ida_pci.c
    M sys/dev/ips/ips_pci.c
    M sys/dev/isp/isp_pci.c
    M sys/dev/iwn/if_iwn.c
    M sys/dev/ixgb/if_ixgb.c
    M sys/dev/ixgbe/ixgbe.c
    M sys/dev/ixgbe/ixv.c
    M sys/dev/mfi/mfi_pci.c
    M sys/dev/mlx/mlx_pci.c
    M sys/dev/mly/mly.c
    M sys/dev/mn/if_mn.c
    M sys/dev/mps/mps_pci.c
    M sys/dev/mpt/mpt_pci.c
    M sys/dev/mwl/if_mwl_pci.c
    M sys/dev/mxge/if_mxge.c
    M sys/dev/pccbb/pccbb_pci.c
    M sys/dev/pst/pst-pci.c
    M sys/dev/rp/rp_pci.c
    M sys/dev/safe/safe.c
    M sys/dev/sound/pci/als4000.c
    M sys/dev/sound/pci/aureal.c
    M sys/dev/sound/pci/cmi.c
    M sys/dev/sound/pci/cs4281.c
    M sys/dev/sound/pci/csa.c
    M sys/dev/sound/pci/ds1.c
    M sys/dev/sound/pci/emu10k1.c
    M sys/dev/sound/pci/emu10kx.c
    M sys/dev/sound/pci/envy24.c
    M sys/dev/sound/pci/envy24ht.c
    M sys/dev/sound/pci/es137x.c
    M sys/dev/sound/pci/fm801.c
    M sys/dev/sound/pci/hdspe.c
    M sys/dev/sound/pci/maestro.c
    M sys/dev/sound/pci/maestro3.c
    M sys/dev/sound/pci/neomagic.c
    M sys/dev/sound/pci/solo.c
    M sys/dev/sound/pci/t4dwave.c
    M sys/dev/sound/pci/via82c686.c
    M sys/dev/sound/pci/vibes.c
    M sys/dev/stge/if_stge.c
    M sys/dev/sym/sym_hipd.c
    M sys/dev/tdfx/tdfx_pci.c
    M sys/dev/twa/tw_osl_freebsd.c
    M sys/dev/tws/tws.c
    M sys/dev/ubsec/ubsec.c
    M sys/dev/wi/if_wi_pci.c
    M sys/modules/ixgbe/Makefile
    M sys/netinet/sctp_output.c
    M sys/pci/ncr.c
    M usr.sbin/bsdconfig/include/messages.subr
    M usr.sbin/bsdconfig/share/media/ftp.subr
    M usr.sbin/bsdinstall/scripts/mirrorselect
    M usr.sbin/makefs/makefs.8
    M usr.sbin/makefs/makefs.c
    M usr.sbin/pkg_install/add/main.c

  Log Message:
  -----------
  Merge branch 'releng/9.2' of github.com:freebsd/freebsd into releng/9.2

Conflicts:
	sys/boot/forth/beastie.4th
	sys/boot/forth/loader.rc
	sys/boot/forth/menu.4th
	sys/conf/newvers.sh


Compare: https://github.com/pcbsd/freebsd/compare/3394e9bdc2eb...793915cded83


More information about the Commits mailing list