summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-02-15 22:19:34 +0200
committeriwlwifi publisher <>2024-04-17 12:48:34 +0000
commitf5bdcb5cc3a29df8174ec7323d861d49dde61155 (patch)
tree2d8b0a434afdc4b35495c2a7df4ef108e46e76d8
parent82b833356e7df552ec0df25600e09e705d5d6d10 (diff)
downloadbackport-iwlwifi-f5bdcb5cc3a29df8174ec7323d861d49dde61155.tar.gz
Merge remote-tracking branch 'auto/master'
Merge tag 'v6.8-rc4' Linux 6.8-rc4 Commits in this merge: Allison Henderson (1): MAINTAINERS: Maintainer change for rds Andrew Morton (2): Merge branch 'master' into mm-hotfixes-stable Merge branch 'master' into mm-hotfixes-stable Arend van Spriel (1): MAINTAINERS: wifi: brcm80211: cleanup entry Benjamin Berg (2): wifi: iwlwifi: mvm: skip adding debugfs symlink for reconfig wifi: iwlwifi: do not announce EPCS support Emmanuel Grumbach (1): wifi: iwlwifi: mvm: fix a battery life regression Gregory Greenman (1): MAINTAINERS: remove myself as iwlwifi driver maintainer Jakub Kicinski (1): Merge tag 'wireless-2024-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless Johannes Berg (13): wifi: iwlwifi: fix double-free bug wifi: cfg80211: fix wiphy delayed work queueing wifi: iwlwifi: remove extra kernel-doc wifi: cfg80211: detect stuck ECSA element in probe resp wifi: mac80211: improve CSA/ECSA connection refusal wifi: mac80211: fix RCU use in TDLS fast-xmit wifi: mac80211: set station RX-NSS on reconfig wifi: mac80211: fix driver debugfs for vif type change wifi: mac80211: initialize SMPS mode correctly wifi: mac80211: fix unsolicited broadcast probe config wifi: mac80211: fix waiting for beacons logic wifi: mac80211: adding missing drv_mgd_complete_tx() call wifi: mac80211: accept broadcast probe responses on 6 GHz Joonas Lahtinen (1): Merge tag 'gvt-fixes-2024-02-05' of https://github.com/intel/gvt-linux into drm-intel-fixes Leo Yan (1): MAINTAINERS: Leo Yan has moved Linus Torvalds (4): Merge tag 'bcachefs-2024-02-05' of https://evilpiepirate.org/git/bcachefs Merge tag 'net-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Merge tag 'drm-fixes-2024-02-09' of git://anongit.freedesktop.org/drm/drm Merge tag 'mm-hotfixes-stable-2024-02-10-11-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Mario Limonciello (1): wifi: mac80211: Drop WBRF debugging statements Miri Korenblit (1): wifi: iwlwifi: exit eSR only after the FW does Zhenyu Wang (1): drm/i915: Replace dead 01.org link Zhi Wang (1): MAINTAINERS: Update Zhi Wang's email address x-git-tracker-backport: 2d21dea58bded4804313c0b53554673821f574b1 x-git-tracker-iwlwifi: b9b7f42fe27d036ae96f793366a6187f67cdbd26 Change-Id: Idc3dd3c58841c7c266b0c249c8b3ea1db710f22f x-iwlwifi-stack-dev: 8d7b5faea00d9f19e3bbeb400c442e74033f1ef8
-rw-r--r--MAINTAINERS17
-rw-r--r--net/mac80211/wbrf.c2
-rw-r--r--versions2
3 files changed, 9 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 960512bec4..73d898383e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4169,14 +4169,14 @@ F: drivers/firmware/broadcom/tee_bnxt_fw.c
F: drivers/net/ethernet/broadcom/bnxt/
F: include/linux/firmware/broadcom/tee_bnxt_fw.h
-BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
-M: Arend van Spriel <aspriel@gmail.com>
-M: Franky Lin <franky.lin@broadcom.com>
-M: Hante Meuleman <hante.meuleman@broadcom.com>
+BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS
+M: Arend van Spriel <arend.vanspriel@broadcom.com>
L: linux-wireless@vger.kernel.org
+L: brcm80211@lists.linux.dev
L: brcm80211-dev-list.pdl@broadcom.com
S: Supported
F: drivers/net/wireless/broadcom/brcm80211/
+F: include/linux/platform_data/brcmfmac.h
BROADCOM BRCMSTB GPIO DRIVER
M: Doug Berger <opendmb@gmail.com>
@@ -10801,11 +10801,11 @@ F: drivers/gpio/gpio-tangier.h
INTEL GVT-g DRIVERS (Intel GPU Virtualization)
M: Zhenyu Wang <zhenyuw@linux.intel.com>
-M: Zhi Wang <zhi.a.wang@intel.com>
+M: Zhi Wang <zhi.wang.linux@gmail.com>
L: intel-gvt-dev@lists.freedesktop.org
L: intel-gfx@lists.freedesktop.org
S: Supported
-W: https://01.org/igvt-g
+W: https://github.com/intel/gvt-linux/wiki
T: git https://github.com/intel/gvt-linux.git
F: drivers/gpu/drm/i915/gvt/
@@ -11127,7 +11127,6 @@ S: Supported
F: drivers/net/wireless/intel/iwlegacy/
INTEL WIRELESS WIFI LINK (iwlwifi)
-M: Gregory Greenman <gregory.greenman@intel.com>
M: Miri Korenblit <miriam.rachel.korenblit@intel.com>
L: linux-wireless@vger.kernel.org
S: Supported
@@ -17183,7 +17182,7 @@ R: John Garry <john.g.garry@oracle.com>
R: Will Deacon <will@kernel.org>
R: James Clark <james.clark@arm.com>
R: Mike Leach <mike.leach@linaro.org>
-R: Leo Yan <leo.yan@linaro.org>
+R: Leo Yan <leo.yan@linux.dev>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Supported
F: tools/build/feature/test-libopencsd.c
@@ -18432,7 +18431,7 @@ S: Supported
F: drivers/infiniband/sw/rdmavt
RDS - RELIABLE DATAGRAM SOCKETS
-M: Santosh Shilimkar <santosh.shilimkar@oracle.com>
+M: Allison Henderson <allison.henderson@oracle.com>
L: netdev@vger.kernel.org
L: linux-rdma@vger.kernel.org
L: rds-devel@oss.oracle.com (moderated for non-subscribers)
diff --git a/net/mac80211/wbrf.c b/net/mac80211/wbrf.c
index a05c5b9717..3a86123091 100644
--- a/net/mac80211/wbrf.c
+++ b/net/mac80211/wbrf.c
@@ -23,8 +23,6 @@ void ieee80211_check_wbrf_support(struct ieee80211_local *local)
return;
local->wbrf_supported = acpi_amd_wbrf_supported_producer(dev);
- dev_dbg(dev, "WBRF is %s supported\n",
- local->wbrf_supported ? "" : "not");
}
static void get_chan_freq_boundary(u32 center_freq, u32 bandwidth, u64 *start, u64 *end)
diff --git a/versions b/versions
index ffb48a7d61..09ea36cc11 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11893:c0a9af41"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11894:8d7b5fae"