Re: [PATCH v3] mm/shmem, swap: fix softlockup with mTHP swapin

[Andrew Morton]

On Thu, 12 Jun 2025 00:06:56 +0800 Kairui Song <ryncsn@xxxxxxxxx> wrote:

> > > The reason is simple, readahead brought some order 0 folio in swap cache,
> > > and the swapin mTHP folio being allocated is in confict with it, so
> >                                                   ^^^typo, conflict
> >
> 
> Nice catch, thanks!
> 
> Hi Andrew, it's only one typo in the commit message here, will you
> help update the commit message while merging 

No probs.  

checkpatch can catch these things if the typo is in scripts/spelling.txt.

x1:/usr/src/linux-6.16-rc1> grep -r confict . | wc -l
5
x1:/usr/src/mm> git log | grep confict | wc -l
26

and it seems it should be!  I bet Colin can fix that for us.