On Thu, Mar 11, 2021 at 6:45 AM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > On Thu, 11 Mar 2021 09:32:45 +0800 Walter Wu <walter-zh.wu@xxxxxxxxxxxx> wrote: > > > > > Hi Andrew, > > > > I see my v4 patch is different in the next tree now. please see below > > information. > > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=ebced5fb0ef969620ecdc4011f600f9e7c229a3c > > The different is in lib/Kconfig.kasan. > > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/diff/lib/Kconfig.kasan?id=ebced5fb0ef969620ecdc4011f600f9e7c229a3c > > > > They look the same to me. I did have `int' for KASAN_STACK due to a > merging mess, but I changed that to bool quite quickly. There's still something wrong with this patch in the mm tree. The KASAN_STACK option is duplicated in lib/Kconfig.kasan. Badly resolved conflict with "kasan: fix KASAN_STACK dependency for HW_TAGS"?
