| Message ID | 20220722082653.74553-1-slark_xiao@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | wireless: ath: Fix typo 'the the' in comment | expand |
Slark Xiao <slark_xiao@163.com> wrote: > Replace 'the the' with 'the' in the comment. > > Signed-off-by: Slark Xiao <slark_xiao@163.com> Fails to apply, please rebase on top my ath.git master branch. error: patch failed: drivers/net/wireless/ath/ath6kl/hif.h:92 error: drivers/net/wireless/ath/ath6kl/hif.h: patch does not apply error: patch failed: drivers/net/wireless/ath/ath6kl/sdio.c:1185 error: drivers/net/wireless/ath/ath6kl/sdio.c: patch does not apply error: patch failed: drivers/net/wireless/ath/wcn36xx/hal.h:4142 error: drivers/net/wireless/ath/wcn36xx/hal.h: patch does not apply stg import: Diff does not apply cleanly Patch set to Changes Requested.
At 2022-07-25 19:06:50, "Kalle Valo" <kvalo@kernel.org> wrote: >Slark Xiao <slark_xiao@163.com> wrote: > >> Replace 'the the' with 'the' in the comment. >> >> Signed-off-by: Slark Xiao <slark_xiao@163.com> > >Fails to apply, please rebase on top my ath.git master branch. > >error: patch failed: drivers/net/wireless/ath/ath6kl/hif.h:92 >error: drivers/net/wireless/ath/ath6kl/hif.h: patch does not apply >error: patch failed: drivers/net/wireless/ath/ath6kl/sdio.c:1185 >error: drivers/net/wireless/ath/ath6kl/sdio.c: patch does not apply >error: patch failed: drivers/net/wireless/ath/wcn36xx/hal.h:4142 >error: drivers/net/wireless/ath/wcn36xx/hal.h: patch does not apply >stg import: Diff does not apply cleanly > >Patch set to Changes Requested. > >-- >https://patchwork.kernel.org/project/linux-wireless/patch/20220722082653.74553-1-slark_xiao@163.com/ > >https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches Bad news, I can't get your ath code completely. ubuntu@VM-0-27-ubuntu:~/ath$ !142 git clone git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git Cloning into 'ath'... remote: Enumerating objects: 202, done. remote: Counting objects: 100% (202/202), done. remote: Compressing objects: 100% (83/83), done. Receiving objects: 100% (8897606/8897606), 2.47 GiB | 11.99 MiB/s, done. remote: Total 8897606 (delta 150), reused 133 (delta 119), pack-reused 8897404 error: index-pack died of signal 984000) fatal: index-pack failed ubuntu@VM-0-27-ubuntu:~/ath$ git clone https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git Cloning into 'ath'... remote: Enumerating objects: 202, done. remote: Counting objects: 100% (202/202), done. remote: Compressing objects: 100% (83/83), done. remote: Total 8897606 (delta 150), reused 133 (delta 119), pack-reused 8897404 Receiving objects: 100% (8897606/8897606), 2.47 GiB | 11.88 MiB/s, done. error: index-pack died of signal 984000) fatal: index-pack failed ubuntu@VM-0-27-ubuntu:~/ath$ git clone https://kernel.googlesource.com/pub/scm/linux/kernel/git/kvalo/ath.git Cloning into 'ath'... remote: Sending approximately 1.67 GiB ... remote: Counting objects: 29323, done remote: Finding sources: 100% (8897606/8897606) remote: Total 8897606 (delta 7524073), reused 8897044 (delta 7524073) Receiving objects: 100% (8897606/8897606), 1.67 GiB | 11.98 MiB/s, done. error: index-pack died of signal 94073) fatal: index-pack failed I tried these 3 servers but all failed. Any other ideas?
At 2022-07-26 10:31:31, "Slark Xiao" <slark_xiao@163.com> wrote: > > > > > > > > > > > > > > > > >At 2022-07-25 19:06:50, "Kalle Valo" <kvalo@kernel.org> wrote: >>Slark Xiao <slark_xiao@163.com> wrote: >> >>> Replace 'the the' with 'the' in the comment. >>> >>> Signed-off-by: Slark Xiao <slark_xiao@163.com> >> >>Fails to apply, please rebase on top my ath.git master branch. >> >>error: patch failed: drivers/net/wireless/ath/ath6kl/hif.h:92 >>error: drivers/net/wireless/ath/ath6kl/hif.h: patch does not apply >>error: patch failed: drivers/net/wireless/ath/ath6kl/sdio.c:1185 >>error: drivers/net/wireless/ath/ath6kl/sdio.c: patch does not apply >>error: patch failed: drivers/net/wireless/ath/wcn36xx/hal.h:4142 >>error: drivers/net/wireless/ath/wcn36xx/hal.h: patch does not apply >>stg import: Diff does not apply cleanly >> >>Patch set to Changes Requested. >> >>-- >>https://patchwork.kernel.org/project/linux-wireless/patch/20220722082653.74553-1-slark_xiao@163.com/ >> >>https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches > >Bad news, I can't get your ath code completely. >ubuntu@VM-0-27-ubuntu:~/ath$ !142 >git clone git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git >Cloning into 'ath'... >remote: Enumerating objects: 202, done. >remote: Counting objects: 100% (202/202), done. >remote: Compressing objects: 100% (83/83), done. >Receiving objects: 100% (8897606/8897606), 2.47 GiB | 11.99 MiB/s, done. >remote: Total 8897606 (delta 150), reused 133 (delta 119), pack-reused 8897404 >error: index-pack died of signal 984000) >fatal: index-pack failed > >ubuntu@VM-0-27-ubuntu:~/ath$ git clone https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git >Cloning into 'ath'... >remote: Enumerating objects: 202, done. >remote: Counting objects: 100% (202/202), done. >remote: Compressing objects: 100% (83/83), done. >remote: Total 8897606 (delta 150), reused 133 (delta 119), pack-reused 8897404 >Receiving objects: 100% (8897606/8897606), 2.47 GiB | 11.88 MiB/s, done. >error: index-pack died of signal 984000) >fatal: index-pack failed > >ubuntu@VM-0-27-ubuntu:~/ath$ git clone https://kernel.googlesource.com/pub/scm/linux/kernel/git/kvalo/ath.git >Cloning into 'ath'... >remote: Sending approximately 1.67 GiB ... >remote: Counting objects: 29323, done >remote: Finding sources: 100% (8897606/8897606) >remote: Total 8897606 (delta 7524073), reused 8897044 (delta 7524073) >Receiving objects: 100% (8897606/8897606), 1.67 GiB | 11.98 MiB/s, done. >error: index-pack died of signal 94073) >fatal: index-pack failed > >I tried these 3 servers but all failed. Any other ideas? I fix it by adding virtual memory in my VM. And version v2 has been sent for this changes. Seems some files has been fixed already. Thanks
diff --git a/drivers/net/wireless/ath/ath6kl/hif.h b/drivers/net/wireless/ath/ath6kl/hif.h index f9d3f3a5edfe..ba16b98c872d 100644 --- a/drivers/net/wireless/ath/ath6kl/hif.h +++ b/drivers/net/wireless/ath/ath6kl/hif.h @@ -92,7 +92,7 @@ struct bus_request { * emode - This indicates the whether the command is to be executed in a * blocking or non-blocking fashion (HIF_SYNCHRONOUS/ * HIF_ASYNCHRONOUS). The read/write data paths in HTC have been - * implemented using the asynchronous mode allowing the the bus + * implemented using the asynchronous mode allowing the bus * driver to indicate the completion of operation through the * registered callback routine. The requirement primarily comes * from the contexts these operations get called from (a driver's diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c index 6b51a2dceadc..8a43c48ec1cf 100644 --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c @@ -1185,7 +1185,7 @@ static int ath6kl_sdio_bmi_read(struct ath6kl *ar, u8 *buf, u32 len) * Wait for first 4 bytes to be in FIFO * If CONSERVATIVE_BMI_READ is enabled, also wait for * a BMI command credit, which indicates that the ENTIRE - * response is available in the the FIFO + * response is available in the FIFO * * CASE 3: length > 128 * Wait for the first 4 bytes to be in FIFO diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index dc0e5ea25673..090ff0600c81 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -1744,7 +1744,7 @@ static void ar9003_hw_spectral_scan_config(struct ath_hw *ah, REG_SET_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_FFT_ENA); REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENABLE); - /* on AR93xx and newer, count = 0 will make the the chip send + /* on AR93xx and newer, count = 0 will make the chip send * spectral samples endlessly. Check if this really was intended, * and fix otherwise. */ diff --git a/drivers/net/wireless/ath/wcn36xx/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h index 874746b5993c..a1afe1f85f0e 100644 --- a/drivers/net/wireless/ath/wcn36xx/hal.h +++ b/drivers/net/wireless/ath/wcn36xx/hal.h @@ -4142,7 +4142,7 @@ struct wcn36xx_hal_dump_cmd_rsp_msg { /* Length of the responce message */ u32 rsp_length; - /* FIXME: Currently considering the the responce will be less than + /* FIXME: Currently considering the responce will be less than * 100bytes */ u8 rsp_buffer[DUMPCMD_RSP_BUFFER]; } __packed;
Replace 'the the' with 'the' in the comment. Signed-off-by: Slark Xiao <slark_xiao@163.com> --- drivers/net/wireless/ath/ath6kl/hif.h | 2 +- drivers/net/wireless/ath/ath6kl/sdio.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- drivers/net/wireless/ath/wcn36xx/hal.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)