commit 1725ffdea03372e1d894fb9c07f8da7d000d6076
author Miri Korenblit <miriam.rachel.korenblit@intel.com> Fri May 17 17:14:04 2024 +0300
committer iwlwifi publisher Sun May 19 03:45:14 2024 +0000
tree 0339a467dab0528170afa1a8741b09d93bc1a615
parent 9c2b76851c43061b57581a609924932817e2ed4c

Merge remote-tracking branch 'auto/master'

Merge tag 'v6.9'

Linux 6.9

Commits in this merge:

Jarkko Sakkinen (1):
      MAINTAINERS: update URL's for KEYS/KEYRINGS_INTEGRITY and TPM DEVICE DRIVER

Linus Torvalds (2):
      Merge tag 'mm-hotfixes-stable-2024-05-10-13-14' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
      Merge tag 'x86_urgent_for_v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Potnuri Bharat Teja (1):
      MAINTAINERS: update cxgb4 and cxgb3 network drivers maintainer

Shyam Sundar S K (1):
      x86/amd_nb: Add new PCI IDs for AMD family 0x1a

x-git-tracker-backport: 1c921cb330b2db747b6c479ae961ae40d7e64747
x-git-tracker-iwlwifi: 1ac6c6d5bee2815d3d2c6f22733dedc70a7c8829
Change-Id: I20c59211b5f4f7b9062fdeaea0be0352e5c7873e
x-iwlwifi-stack-dev: 5e893e527f5ceeb51097dbb2e5667a262c8885f1

MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ec02841..28e2097 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5709,7 +5709,7 @@
 F:	drivers/media/dvb-frontends/cxd2820r*
 
 CXGB3 ETHERNET DRIVER (CXGB3)
-M:	Raju Rangoju <rajur@chelsio.com>
+M:	Potnuri Bharat Teja <bharat@chelsio.com>
 L:	netdev@vger.kernel.org
 S:	Supported
 W:	http://www.chelsio.com
@@ -5730,7 +5730,7 @@
 F:	drivers/crypto/chelsio
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:	Raju Rangoju <rajur@chelsio.com>
+M:	Potnuri Bharat Teja <bharat@chelsio.com>
 L:	netdev@vger.kernel.org
 S:	Supported
 W:	http://www.chelsio.com
@@ -5759,7 +5759,7 @@
 F:	include/uapi/rdma/cxgb4-abi.h
 
 CXGB4VF ETHERNET DRIVER (CXGB4VF)
-M:	Raju Rangoju <rajur@chelsio.com>
+M:	Potnuri Bharat Teja <bharat@chelsio.com>
 L:	netdev@vger.kernel.org
 S:	Supported
 W:	http://www.chelsio.com
@@ -12041,6 +12041,7 @@
 L:	linux-integrity@vger.kernel.org
 L:	keyrings@vger.kernel.org
 S:	Supported
+W:	https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
 F:	security/integrity/platform_certs
 
 KFENCE
@@ -22409,7 +22410,7 @@
 R:	Jason Gunthorpe <jgg@ziepe.ca>
 L:	linux-integrity@vger.kernel.org
 S:	Maintained
-W:	https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
+W:	https://gitlab.com/jarkkojs/linux-tpmdd-test
 Q:	https://patchwork.kernel.org/project/linux-integrity/list/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
 F:	Documentation/devicetree/bindings/tpm/

include/linux/pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a0c75e4..c547d1d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -580,6 +580,7 @@
 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
 #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
 #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
+#define PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3 0x12bb
 #define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3
 #define PCI_DEVICE_ID_AMD_MI300_DF_F3	0x152b
 #define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a

versions

diff --git a/versions b/versions
index 848ee60..d56ef76 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@
 BACKPORTED_KERNEL_VERSION="(see git)"
 BACKPORTED_KERNEL_NAME="iwlwifi"
 BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12219:300a19d0"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12220:5e893e52"