On 12/12/22 23:27, Andrew Morton wrote: > On Mon, 12 Dec 2022 15:16:43 -0700 "Jason A. Donenfeld" <Jason@xxxxxxxxx> 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@xxxxxxxxxx/ >> > > 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
