Received-SPF: pass (google.com: domain of linux-kernel+bounces-206763-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Thomas Gleixner <tglx@linutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Dmitry Torokhov
 <dmitry.torokhov@gmail.com>, Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Yury Norov <yury.norov@gmail.com>
Subject: Re: linux-next: manual merge of the input tree with the mm tree
In-Reply-To: <20240607102417.2cc20b04@canb.auug.org.au>
References: <20240607102417.2cc20b04@canb.auug.org.au>
Date: Fri, 07 Jun 2024 23:19:14 +0200
Message-ID: <8734po1mel.ffs@tglx>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain

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