From owner-dev-commits-src-branches@freebsd.org Sun Jul 18 00:37:01 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BBA6865F6F3; Sun, 18 Jul 2021 00:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GS5dm6gtCz4RWq; Sun, 18 Jul 2021 00:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 157DF1A498; Sun, 18 Jul 2021 00:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16I0avdQ049817; Sun, 18 Jul 2021 00:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I0avat049816; Sun, 18 Jul 2021 00:36:57 GMT (envelope-from git) Date: Sun, 18 Jul 2021 00:36:57 GMT Message-Id: <202107180036.16I0avat049816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f72db34d2295 - stable/13 - Bump __FreeBSD_version to 1300512 for LinuxKPI changes and OFED cleanup from linux netdevice.h. drm-kmod needs rebuilding after this. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f72db34d2295080f57a283858125aa906c0d409e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 00:37:02 -0000 The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f72db34d2295080f57a283858125aa906c0d409e commit f72db34d2295080f57a283858125aa906c0d409e Author: Bjoern A. Zeeb AuthorDate: 2021-07-17 21:48:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-07-18 00:35:04 +0000 Bump __FreeBSD_version to 1300512 for LinuxKPI changes and OFED cleanup from linux netdevice.h. drm-kmod needs rebuilding after this. --- UPDATING | 6 ++++++ sys/sys/param.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index a3fe9b74a245..b780eeb7b887 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,12 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20210718: + Bump __FreeBSD_version to 1300512 after merging LinuxKPI, OFED, + net80211, and driver changes in order to support building + Intel wireless iwlwifi drivers. This is especially needed for + drm-kmod which needs updates after this. + 20210715: The 20210707 awk update brought in a change in behavior. This has been corrected as of d4d252c49976. Between these dates, if you diff --git a/sys/sys/param.h b/sys/sys/param.h index 4c43839c297e..877cdaa74204 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300511 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300512 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,