[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: iwinfo: add hardware id for MT7922 devices support Revert "x86: fix Bintel's ZHITAI Ti Plus 5000 fw bug"
Sneezyw · Nov 25, 2022 · 9094566 · 9094566
2 parents fbe7f4a + bf2528d
commit 9094566
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 28 deletions.
diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiwinfo
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git

diff --git a/package/network/utils/iwinfo/patches/002-devices-add-MediaTek-MT7922-device-id.patch b/package/network/utils/iwinfo/patches/002-devices-add-MediaTek-MT7922-device-id.patch
@@ -0,0 +1,9 @@
+--- a/hardware.txt
++++ b/hardware.txt
+@@ -225,5 +225,6 @@
+ 0x14c3 0x7650 0x14c3 0x7650    0      0  "MediaTek" "MT7610E"
+ 0x14c3 0x7662 0x14c3 0x7662    0      0  "MediaTek" "MT76x2E"
+ 0x14c3 0x7915 0x14c3 0x7915    0      0  "MediaTek" "MT7915E"
++0x14c3 0x7922 0x1A3B 0x5300    0      0  "MediaTek" "MT7922"
+ 0x14e4 0xaa52 0x14e4 0xaa52    0      0  "Broadcom" "BCM43602"
+ 0x1ae9 0x0310 0x1ae9 0x0000    0      0  "Wilocity" "Wil6210"
diff --git a/target/linux/x86/patches-5.15/999-fix-nvme_ms_ids-bug.patch b/target/linux/x86/patches-5.15/999-fix-nvme_ms_ids-bug.patch