linux-kernel - Re: linux-next: manual merge of the input 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: <20240612103235.5ef64950@canb.auug.org.au>
Date: Wed, 12 Jun 2024 10:32:35 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Yury Norov <yury.norov@...il.com>
Subject: Re: linux-next: manual merge of the input tree with the mm tree

Hi all,

On Fri, 07 Jun 2024 23:19:14 +0200 Thomas Gleixner <tglx@...utronix.de> wrote:
>
> On Fri, Jun 07 2024 at 10:24, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the input tree got a conflict in:
> >
> >   include/linux/interrupt.h
> >
> > between commit:
> >
> >   2156d61a07d9 ("cpumask: make core headers including cpumask_types.h where possible")
> >
> > from the mm-noonmm-unstable branch of the mm tree and commit:
> >
> >   c76494768761 ("linux/interrupt.h: allow "guard" notation to disable and reenable IRQ")
> >
> > from the input 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.  
> 
> Dmitry has this commit tagged for tip tree consumption. I take care of
> that tomorrow.

The resolution is now as below.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/interrupt.h
index 136a55455529,3a36e64119c8..000000000000
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -5,6 -5,8 +5,7 @@@
  
  #include <linux/kernel.h>
  #include <linux/bitops.h>
+ #include <linux/cleanup.h>
 -#include <linux/cpumask.h>
  #include <linux/irqreturn.h>
  #include <linux/irqnr.h>
  #include <linux/hardirq.h>

Content of type "application/pgp-signature" skipped