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] [thread-next>] [day] [month] [year] [list]

Date: Fri, 07 Jun 2024 23:19:14 +0200
From: Thomas Gleixner <tglx@...utronix.de>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Dmitry Torokhov
 <dmitry.torokhov@...il.com>, Andrew Morton <akpm@...ux-foundation.org>
Cc: 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

On Fri, Jun 07 2024 at 10:24, Stephen Rothwell wrote:

> Hi all,
>
> 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.

Thanks,

        tglx