linux-kernel - Re: linux-next: manual merge of the tip tree with the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20240717092708.0a40aca4@canb.auug.org.au>
Date: Wed, 17 Jul 2024 09:27:08 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 "Borislav Petkov (AMD)" <bp@...en8.de>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Tony Luck <tony.luck@...el.com>, Yury Norov
 <yury.norov@...il.com>
Subject: Re: linux-next: manual merge of the tip tree with the mm tree

Hi all,

On Wed, 12 Jun 2024 11:27:46 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   include/linux/cacheinfo.h
> 
> between commit:
> 
>   f6a9651bfd74 ("cpumask: make core headers including cpumask_types.h where possible")
> 
> from the mm-nonmm-unstable branch of the mm tree and commit:
> 
>   685cb1674060 ("cacheinfo: Add function to get cacheinfo for a given CPU and cache level")
> 
> from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc include/linux/cacheinfo.h
> index 286db104e054,3dde175f4108..000000000000
> --- a/include/linux/cacheinfo.h
> +++ b/include/linux/cacheinfo.h
> @@@ -3,7 -3,8 +3,8 @@@
>   #define _LINUX_CACHEINFO_H
>   
>   #include <linux/bitops.h>
> + #include <linux/cpuhplock.h>
>  -#include <linux/cpumask.h>
>  +#include <linux/cpumask_types.h>
>   #include <linux/smp.h>
>   
>   struct device_node;

This is now a conflict between the mm-nonmm-stable tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped