Merge branch 'ath10k-20230405' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/linux-firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>

WHENCE

@@ -3419,7 +3419,7 @@ File: ath11k/IPQ6018/hw1.0/q6_fw.b07
 File: ath11k/IPQ6018/hw1.0/q6_fw.b08
 File: ath11k/IPQ6018/hw1.0/q6_fw.flist
 File: ath11k/IPQ6018/hw1.0/q6_fw.mdt
-Version: WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
+Version: WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
 File: ath11k/IPQ6018/hw1.0/Notice.txt
 File: ath11k/IPQ8074/hw2.0/board-2.bin
 File: ath11k/IPQ8074/hw2.0/m3_fw.b00
@@ -3437,7 +3437,7 @@ File: ath11k/IPQ8074/hw2.0/q6_fw.b07
 File: ath11k/IPQ8074/hw2.0/q6_fw.b08
 File: ath11k/IPQ8074/hw2.0/q6_fw.flist
 File: ath11k/IPQ8074/hw2.0/q6_fw.mdt
-Version: WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
+Version: WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
 File: ath11k/IPQ8074/hw2.0/Notice.txt
 File: ath11k/QCA6390/hw2.0/board-2.bin
 File: ath11k/QCA6390/hw2.0/amss.bin
@@ -3457,7 +3457,7 @@ Link: ath11k/WCN6855/hw2.1/m3.bin -> ../hw2.0/m3.bin
 File: ath11k/QCN9074/hw1.0/board-2.bin
 File: ath11k/QCN9074/hw1.0/amss.bin
 File: ath11k/QCN9074/hw1.0/m3.bin
-Version: WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
+Version: WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
 File: ath11k/QCN9074/hw1.0/Notice.txt
 File: ath11k/WCN6750/hw1.0/board-2.bin
 File: ath11k/WCN6750/hw1.0/wpss.b00
@@ -3470,7 +3470,7 @@ File: ath11k/WCN6750/hw1.0/wpss.b06
 File: ath11k/WCN6750/hw1.0/wpss.b07
 File: ath11k/WCN6750/hw1.0/wpss.b08
 File: ath11k/WCN6750/hw1.0/wpss.mdt
-Version: WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1
+Version: WLAN.MSL.1.0.1-01160-QCAMSLSWPLZ-1
 File: ath11k/WCN6750/hw1.0/Notice.txt
 File: ath11k/IPQ5018/hw1.0/board-2.bin
 File: ath11k/IPQ5018/hw1.0/m3_fw.b00

ath11k/WCN6750/hw1.0/Notice.txt

@@ -1,23 +1,30 @@
-This Notice.txt file contains certain notices of software components
+This file contains certain notices of software components included
-included with the software that Qualcomm Atheros, Inc. ("Qualcomm
+with the software that Qualcomm Technologies, Inc. ("QTI") is required
-Atheros") is required to provide you. Except where prohibited by the
+to provide you. Except where prohibited by the open source license,
-open source license, the content of this notices file is only provided
+the content of this file is provided solely to satisfy QTI's
-to satisfy Qualcomm Atheros's attribution and notice requirement; your
+attribution and notice requirement; your use of these software
-use of these software components together with the Qualcomm Atheros
+components together with the QTI software ("Software") is subject to
-software (Qualcomm Atheros software hereinafter referred to as
+the terms of your license from QTI. Compliance with all copyright laws
-"Software") is subject to the terms of your agreement from Qualcomm
+and software license agreements included in the notice section of this
-Atheros. Compliance with all copyright laws and software license
+file are the responsibility of the user. Except as may be granted by
-agreements included in the notice section of this file are the
+separate express written agreement, this file provides no license to
-responsibility of the user. Except as may be granted by separate
+any patents, trademarks, copyrights, or other intellectual property of
-express written agreement, this file provides no license to any
-patents, trademarks, copyrights, or other intellectual property of
 Qualcomm Incorporated or any of its subsidiaries.
 
+Software provided with this notice is NOT A CONTRIBUTION to any open
+source project. If alternative licensing is available for any of the
+components with licenses or attributions provided below, a license
+choice is made for receiving such code by QTI.
+
+Copyright (c) 2022-2023 Qualcomm Technologies, Inc. All rights reserved.
+
 Qualcomm is a trademark of Qualcomm Incorporated, registered in the
 United States and other countries. All Qualcomm Incorporated
 trademarks are used with permission. Other products and brand names
 may be trademarks or registered trademarks of their respective owners.
 
+
+
 ================================================================================
 
 File: wmix.h
@@ -26,6 +33,19 @@ File: wmix.h
  * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
+ * Copyright (C) 2010-2015 ARM Limited. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * Neither the name of ARM LIMITED nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -7378,3 +7398,5 @@ File: sys_system.c
  */
 
 =====================================================================================
+
+