diff for duplicates of <87y3lu9302.fsf@kamboji.qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index c0fc746..d65d297 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,41 +8,38 @@ Erik Stromdahl <erik.stromdahl@gmail.com> writes:
 
 > --- a/drivers/net/wireless/ath/ath10k/core.c
 > +++ b/drivers/net/wireless/ath/ath10k/core.c
-> @@ -328,6 +328,29 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
->  		.vht160_mcs_rx_highest = 0,
->  		.vht160_mcs_tx_highest = 0,
+> @@ -328,6 +328,29 @@ static const struct ath10k_hw_params ath10k_hw_param=
+s_list[] =3D {
+>  		.vht160_mcs_rx_highest =3D 0,
+>  		.vht160_mcs_tx_highest =3D 0,
 >  	},
 > +	{
-> +		.id = QCA9377_HW_1_1_DEV_VERSION,
-> +		.dev_id = QCA9377_1_0_DEVICE_ID,
-> +		.name = "qca9377 hw1.1 usb",
-> +		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,
-> +		.uart_pin = 6,
-> +		.otp_exe_param = 0,
-> +		.channel_counters_freq_hz = 88000,
-> +		.max_probe_resp_desc_thres = 0,
-> +		.cal_data_len = 8124,
-> +		.fw = {
-> +			.dir = QCA9377_HW_1_0_FW_DIR,
-> +			.board = QCA9377_HW_1_0_BOARD_DATA_FILE_USB,
-> +			.board_size = QCA9377_BOARD_DATA_SZ,
-> +			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,
+> +		.id =3D QCA9377_HW_1_1_DEV_VERSION,
+> +		.dev_id =3D QCA9377_1_0_DEVICE_ID,
+> +		.name =3D "qca9377 hw1.1 usb",
+> +		.patch_load_addr =3D QCA9377_HW_1_0_PATCH_LOAD_ADDR,
+> +		.uart_pin =3D 6,
+> +		.otp_exe_param =3D 0,
+> +		.channel_counters_freq_hz =3D 88000,
+> +		.max_probe_resp_desc_thres =3D 0,
+> +		.cal_data_len =3D 8124,
+> +		.fw =3D {
+> +			.dir =3D QCA9377_HW_1_0_FW_DIR,
+> +			.board =3D QCA9377_HW_1_0_BOARD_DATA_FILE_USB,
+> +			.board_size =3D QCA9377_BOARD_DATA_SZ,
+> +			.board_ext_size =3D QCA9377_BOARD_EXT_DATA_SZ,
 > +		},
-> +		.hw_ops = &qca988x_ops,
-> +		.decap_align_bytes = 4,
-> +		.max_num_peers = TARGET_QCA9377_HL_NUM_PEERS,
-> +		.is_high_latency = true,
-> +		.bus = ATH10K_BUS_USB,
-> +		.start_once = true,
+> +		.hw_ops =3D &qca988x_ops,
+> +		.decap_align_bytes =3D 4,
+> +		.max_num_peers =3D TARGET_QCA9377_HL_NUM_PEERS,
+> +		.is_high_latency =3D true,
+> +		.bus =3D ATH10K_BUS_USB,
+> +		.start_once =3D true,
 > +	},
 
 Oh, forgot to mention that adding hw_params entry should be last in the
 patchset and only added once all fixes etc are already in place (eg
 patch 10 and 11 should be before this).
 
--- 
-Kalle Valo
-_______________________________________________
-ath10k mailing list
-ath10k@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/ath10k
+--=20
+Kalle Valo=
diff --git a/a/content_digest b/N1/content_digest
index 86c2986..e96c1b2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -18,43 +18,40 @@
  "\n"
  "> --- a/drivers/net/wireless/ath/ath10k/core.c\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/core.c\n"
- "> @@ -328,6 +328,29 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {\n"
- ">  \t\t.vht160_mcs_rx_highest = 0,\n"
- ">  \t\t.vht160_mcs_tx_highest = 0,\n"
+ "> @@ -328,6 +328,29 @@ static const struct ath10k_hw_params ath10k_hw_param=\n"
+ "s_list[] =3D {\n"
+ ">  \t\t.vht160_mcs_rx_highest =3D 0,\n"
+ ">  \t\t.vht160_mcs_tx_highest =3D 0,\n"
  ">  \t},\n"
  "> +\t{\n"
- "> +\t\t.id = QCA9377_HW_1_1_DEV_VERSION,\n"
- "> +\t\t.dev_id = QCA9377_1_0_DEVICE_ID,\n"
- "> +\t\t.name = \"qca9377 hw1.1 usb\",\n"
- "> +\t\t.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,\n"
- "> +\t\t.uart_pin = 6,\n"
- "> +\t\t.otp_exe_param = 0,\n"
- "> +\t\t.channel_counters_freq_hz = 88000,\n"
- "> +\t\t.max_probe_resp_desc_thres = 0,\n"
- "> +\t\t.cal_data_len = 8124,\n"
- "> +\t\t.fw = {\n"
- "> +\t\t\t.dir = QCA9377_HW_1_0_FW_DIR,\n"
- "> +\t\t\t.board = QCA9377_HW_1_0_BOARD_DATA_FILE_USB,\n"
- "> +\t\t\t.board_size = QCA9377_BOARD_DATA_SZ,\n"
- "> +\t\t\t.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,\n"
+ "> +\t\t.id =3D QCA9377_HW_1_1_DEV_VERSION,\n"
+ "> +\t\t.dev_id =3D QCA9377_1_0_DEVICE_ID,\n"
+ "> +\t\t.name =3D \"qca9377 hw1.1 usb\",\n"
+ "> +\t\t.patch_load_addr =3D QCA9377_HW_1_0_PATCH_LOAD_ADDR,\n"
+ "> +\t\t.uart_pin =3D 6,\n"
+ "> +\t\t.otp_exe_param =3D 0,\n"
+ "> +\t\t.channel_counters_freq_hz =3D 88000,\n"
+ "> +\t\t.max_probe_resp_desc_thres =3D 0,\n"
+ "> +\t\t.cal_data_len =3D 8124,\n"
+ "> +\t\t.fw =3D {\n"
+ "> +\t\t\t.dir =3D QCA9377_HW_1_0_FW_DIR,\n"
+ "> +\t\t\t.board =3D QCA9377_HW_1_0_BOARD_DATA_FILE_USB,\n"
+ "> +\t\t\t.board_size =3D QCA9377_BOARD_DATA_SZ,\n"
+ "> +\t\t\t.board_ext_size =3D QCA9377_BOARD_EXT_DATA_SZ,\n"
  "> +\t\t},\n"
- "> +\t\t.hw_ops = &qca988x_ops,\n"
- "> +\t\t.decap_align_bytes = 4,\n"
- "> +\t\t.max_num_peers = TARGET_QCA9377_HL_NUM_PEERS,\n"
- "> +\t\t.is_high_latency = true,\n"
- "> +\t\t.bus = ATH10K_BUS_USB,\n"
- "> +\t\t.start_once = true,\n"
+ "> +\t\t.hw_ops =3D &qca988x_ops,\n"
+ "> +\t\t.decap_align_bytes =3D 4,\n"
+ "> +\t\t.max_num_peers =3D TARGET_QCA9377_HL_NUM_PEERS,\n"
+ "> +\t\t.is_high_latency =3D true,\n"
+ "> +\t\t.bus =3D ATH10K_BUS_USB,\n"
+ "> +\t\t.start_once =3D true,\n"
  "> +\t},\n"
  "\n"
  "Oh, forgot to mention that adding hw_params entry should be last in the\n"
  "patchset and only added once all fixes etc are already in place (eg\n"
  "patch 10 and 11 should be before this).\n"
  "\n"
- "-- \n"
- "Kalle Valo\n"
- "_______________________________________________\n"
- "ath10k mailing list\n"
- "ath10k@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/ath10k
+ "--=20\n"
+ Kalle Valo=
 
-44c341fc5e5e9faf2e9bab8c462672ec137ae96b1763171b0c657df660f33e36
+c7b14b4e2d5e8722b218382f286c3162ea86a26eb9565bbdbbeb1e1188db8b3a
