diff for duplicates of <877eteahoq.fsf@kamboji.qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index 390a4f1..5b87ce1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,43 +8,46 @@ Erik Stromdahl <erik.stromdahl@gmail.com> writes:
 >  drivers/net/wireless/ath/ath10k/hw.h   |  1 +
 >  2 files changed, 26 insertions(+)
 >
-> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
+> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireles=
+s/ath/ath10k/core.c
 > index b6893254ef53..146a9f61b5f0 100644
 > --- a/drivers/net/wireless/ath/ath10k/core.c
 > +++ b/drivers/net/wireless/ath/ath10k/core.c
-> @@ -351,6 +351,31 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
->  		.bus = ATH10K_BUS_USB,
->  		.start_once = true,
+> @@ -351,6 +351,31 @@ static const struct ath10k_hw_params ath10k_hw_param=
+s_list[] =3D {
+>  		.bus =3D ATH10K_BUS_USB,
+>  		.start_once =3D true,
 >  	},
 > +	{
-> +		.id = QCA9377_HW_1_1_DEV_VERSION,
-> +		.dev_id = QCA9377_1_0_DEVICE_ID,
-> +		.name = "qca9377 hw1.1 sdio",
-> +		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,
-> +		.uart_pin = 19,
-> +		.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_SDIO,
-> +			.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 sdio",
+> +		.patch_load_addr =3D QCA9377_HW_1_0_PATCH_LOAD_ADDR,
+> +		.uart_pin =3D 19,
+> +		.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_SDIO,
+> +			.board_size =3D QCA9377_BOARD_DATA_SZ,
+> +			.board_ext_size =3D QCA9377_BOARD_EXT_DATA_SZ,
 > +		},
-> +		.hw_ops = &qca6174_ops,
-> +		.hw_clk = qca6174_clk,
-> +		.target_cpu_freq = 176000000,
-> +		.decap_align_bytes = 4,
-> +		.max_num_peers = TARGET_QCA9377_HL_NUM_PEERS,
-> +		.is_high_latency = true,
-> +		.bus = ATH10K_BUS_SDIO,
-> +		.start_once = true,
+> +		.hw_ops =3D &qca6174_ops,
+> +		.hw_clk =3D qca6174_clk,
+> +		.target_cpu_freq =3D 176000000,
+> +		.decap_align_bytes =3D 4,
+> +		.max_num_peers =3D TARGET_QCA9377_HL_NUM_PEERS,
+> +		.is_high_latency =3D true,
+> +		.bus =3D ATH10K_BUS_SDIO,
+> +		.start_once =3D true,
 > +	},
 >  	{
->  		.id = QCA4019_HW_1_0_DEV_VERSION,
->  		.dev_id = 0,
-> diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
+>  		.id =3D QCA4019_HW_1_0_DEV_VERSION,
+>  		.dev_id =3D 0,
+> diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/=
+ath/ath10k/hw.h
 > index 420851e26a09..77011a6cafa1 100644
 > --- a/drivers/net/wireless/ath/ath10k/hw.h
 > +++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -56,9 +59,5 @@ Erik Stromdahl <erik.stromdahl@gmail.com> writes:
 
 Similar comment about not sure about having separate board.bin for sdio.
 
--- 
-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 0f91830..abce4e0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -18,43 +18,46 @@
  ">  drivers/net/wireless/ath/ath10k/hw.h   |  1 +\n"
  ">  2 files changed, 26 insertions(+)\n"
  ">\n"
- "> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c\n"
+ "> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireles=\n"
+ "s/ath/ath10k/core.c\n"
  "> index b6893254ef53..146a9f61b5f0 100644\n"
  "> --- a/drivers/net/wireless/ath/ath10k/core.c\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/core.c\n"
- "> @@ -351,6 +351,31 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {\n"
- ">  \t\t.bus = ATH10K_BUS_USB,\n"
- ">  \t\t.start_once = true,\n"
+ "> @@ -351,6 +351,31 @@ static const struct ath10k_hw_params ath10k_hw_param=\n"
+ "s_list[] =3D {\n"
+ ">  \t\t.bus =3D ATH10K_BUS_USB,\n"
+ ">  \t\t.start_once =3D true,\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 sdio\",\n"
- "> +\t\t.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,\n"
- "> +\t\t.uart_pin = 19,\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_SDIO,\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 sdio\",\n"
+ "> +\t\t.patch_load_addr =3D QCA9377_HW_1_0_PATCH_LOAD_ADDR,\n"
+ "> +\t\t.uart_pin =3D 19,\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_SDIO,\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 = &qca6174_ops,\n"
- "> +\t\t.hw_clk = qca6174_clk,\n"
- "> +\t\t.target_cpu_freq = 176000000,\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_SDIO,\n"
- "> +\t\t.start_once = true,\n"
+ "> +\t\t.hw_ops =3D &qca6174_ops,\n"
+ "> +\t\t.hw_clk =3D qca6174_clk,\n"
+ "> +\t\t.target_cpu_freq =3D 176000000,\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_SDIO,\n"
+ "> +\t\t.start_once =3D true,\n"
  "> +\t},\n"
  ">  \t{\n"
- ">  \t\t.id = QCA4019_HW_1_0_DEV_VERSION,\n"
- ">  \t\t.dev_id = 0,\n"
- "> diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h\n"
+ ">  \t\t.id =3D QCA4019_HW_1_0_DEV_VERSION,\n"
+ ">  \t\t.dev_id =3D 0,\n"
+ "> diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/=\n"
+ "ath/ath10k/hw.h\n"
  "> index 420851e26a09..77011a6cafa1 100644\n"
  "> --- a/drivers/net/wireless/ath/ath10k/hw.h\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/hw.h\n"
@@ -66,11 +69,7 @@
  "\n"
  "Similar comment about not sure about having separate board.bin for sdio.\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=
 
-8422609926ff21cc6fc45209bb3d4db692c5f1ced103f7e8712ff36f272d882b
+4138651b2cce340e5ffc8b8da1dfafb08cbd047a08ca0352b1aa1a5f240ec523
