Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] lib: zstd: clean up double word in comment.
To:     Nick Terrell <terrelln@fb.com>
Cc:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
References: <20220120132006.749016-1-trix@redhat.com>
 <BFE23560-5B80-4876-9FAA-726E0E9AADC1@fb.com>
From:   Tom Rix <trix@redhat.com>
Message-ID: <0e972d79-aeb0-670f-ba1f-0adea7306084@redhat.com>
Date:   Mon, 24 Jan 2022 12:50:47 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.10.1
MIME-Version: 1.0
In-Reply-To: <BFE23560-5B80-4876-9FAA-726E0E9AADC1@fb.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Precedence: bulk


On 1/24/22 12:18 PM, Nick Terrell wrote:
>
>> On Jan 20, 2022, at 5:20 AM, trix@redhat.com wrote:
>>
>> From: Tom Rix <trix@redhat.com>
>>
>> Remove the second 'a' and 'into'.
> Thanks for the patch!
>
> I'll merge this into my tree and get this into the 5.18 merge window.
>
> If you are able to, can you please submit this patch as a PR upstream [0]?
> Else, I will backport it before my next update. Either way I'll merge this patch.

yes, here it is

https://github.com/facebook/zstd/pull/3026

Tom

>
> Best,
> Nick Terrell
>
> [0] https://github.com/facebook/zstd/blob/dev/lib/zstd.h#L1396-L1407
>
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
>> include/linux/zstd_lib.h | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/linux/zstd_lib.h b/include/linux/zstd_lib.h
>> index b8c7dbf98390f..6b91758b61af9 100644
>> --- a/include/linux/zstd_lib.h
>> +++ b/include/linux/zstd_lib.h
>> @@ -1330,7 +1330,7 @@ ZSTDLIB_API size_t ZSTD_generateSequences(ZSTD_CCtx* zc, ZSTD_Sequence* outSeqs,
>>
>> /*! ZSTD_mergeBlockDelimiters() :
>>   * Given an array of ZSTD_Sequence, remove all sequences that represent block delimiters/last literals
>> - * by merging them into into the literals of the next sequence.
>> + * by merging them into the literals of the next sequence.
>>   *
>>   * As such, the final generated result has no explicit representation of block boundaries,
>>   * and the final last literals segment is not represented in the sequences.
>> @@ -1377,7 +1377,7 @@ ZSTDLIB_API size_t ZSTD_compressSequences(ZSTD_CCtx* const cctx, void* dst, size
>> /*! ZSTD_writeSkippableFrame() :
>>   * Generates a zstd skippable frame containing data given by src, and writes it to dst buffer.
>>   *
>> - * Skippable frames begin with a a 4-byte magic number. There are 16 possible choices of magic number,
>> + * Skippable frames begin with a 4-byte magic number. There are 16 possible choices of magic number,
>>   * ranging from ZSTD_MAGIC_SKIPPABLE_START to ZSTD_MAGIC_SKIPPABLE_START+15.
>>   * As such, the parameter magicVariant controls the exact skippable frame magic number variant used, so
>>   * the magic number used will be ZSTD_MAGIC_SKIPPABLE_START + magicVariant.
>> -- 
>> 2.26.3
>>