diff options
| author | Renato Botelho <renato@netgate.com> | 2017-07-12 13:40:57 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-07-12 13:40:57 -0300 |
| commit | a9101a80183bbf3e77d7fed2b9767f7eae54f1e9 (patch) | |
| tree | 5313afc4a2c47fb9fc6f73107669f760aad717b1 /sys/conf | |
| parent | 4b68fbd1711d1d4d2c7e77e04ffc47257366ac90 (diff) | |
| parent | dc92a5e2298774036551d0b9cdfb9a8814a6414b (diff) | |
| download | FreeBSD-src-a9101a80183bbf3e77d7fed2b9767f7eae54f1e9.zip FreeBSD-src-a9101a80183bbf3e77d7fed2b9767f7eae54f1e9.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index f9080fd..fc04ab9 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -267,7 +267,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/hyperv/netvsc/hv_net_vsc.c optional hyperv dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv -dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv dev/hyperv/utilities/hv_kvp.c optional hyperv dev/hyperv/utilities/hv_util.c optional hyperv diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index f9816ae..e2eb6ce 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -245,7 +245,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/hyperv/netvsc/hv_net_vsc.c optional hyperv dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv -dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv dev/hyperv/utilities/hv_kvp.c optional hyperv dev/hyperv/utilities/hv_util.c optional hyperv diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 88c6932..00b7996 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="RELEASE-p19" +BRANCH="RELEASE-p20" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
