Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e7c6b99a-743f-f40a-0b0f-31730964cb36@suse.cz>
Date:   Tue, 13 Dec 2022 00:16:07 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.1
Subject: Re: [GIT PULL] non-MM commits for 6.2-rc1
Content-Language: en-US
To:     Andrew Morton <akpm@linux-foundation.org>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc:     Linus Torvalds <torvalds@linux-foundation.org>, linux-mm@kvack.org,
        mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20221212134425.b20b80955e5e8a4a36ce1b9a@linux-foundation.org>
 <Y5eoS/UfBhovR70j@zx2c4.com>
 <20221212142754.5f699c4ff515fd9d42768fb2@linux-foundation.org>
From:   Vlastimil Babka <vbabka@suse.cz>
In-Reply-To: <20221212142754.5f699c4ff515fd9d42768fb2@linux-foundation.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 12/12/22 23:27, Andrew Morton wrote:
> On Mon, 12 Dec 2022 15:16:43 -0700 "Jason A. Donenfeld" <Jason@zx2c4.com> wrote:
> 
>> On Mon, Dec 12, 2022 at 01:44:25PM -0800, Andrew Morton wrote:
>> >       wifi: rt2x00: use explicitly signed or unsigned types
>> 
>> Why is this part of your PULL? This was a netdev/wireless tree fix which
>> was in 6.1-rc5. Kalle wrote that he took it on 21 Oct 2022 in:
>> https://lore.kernel.org/all/166633563389.6242.13987912613257140089.kvalo@kernel.org/
>> 
> 
> Huh.  I guess git quietly accepts the identical commit, so Stephen
> never told me and my test-merge-with-Linus-latest also came up clean. 
> Which leaves it to me to manually handle these things, and that's
> unreliable.
> 
> Is there some way of telling git to complain about identical changes
> when doing a trial merge?
 
Probably not exactly that, but there seems to be a way with "git cherry". Dunno
how reliable in practice, seems to be based on patch-id so probably can fail
easily if the commit or context changes slightly?

$ git checkout mm-nonmm-stable-2022-12-12
$ git cherry -v origin/master
+ eabb7f1ace53e127309407b2b5e74e8199e85270 lib/debugobjects: fix stat count and optimize debug_objects_mem_init
+ 461cc6e54ececa86007d44b0ff2521f75b872745 arc: ptrace: user_regset_copyin_ignore() always returns 0
...
+ d472cf797c4e268613dbce5ec9b95d0bcae19ecb debugfs: fix error when writing negative value to atomic_t debugfs file
- d04bb0852b8bd31c53981a04ff0132698d24523d wifi: rt2x00: use explicitly signed or unsigned types
+ 3965292ad0ca70320f1c632f2ac3b886c88b9e80 checkpatch: add check for array allocator family argument order
...

Seems to have worked in this case and flagged the wifi commit with '-'

HTH,
Vlastimil