Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Feedback-ID: i787e41f1:Fastmail
Date:   Mon, 23 Oct 2023 09:28:01 +0200
From:   Greg KH <greg@kroah.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Arnd Bergmann <arnd@arndb.de>, Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the asm-generic
 tree
Message-ID: <2023102350-gumminess-crease-db03@gregkh>
References: <20231023144327.7d18a847@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231023144327.7d18a847@canb.auug.org.au>
Precedence: bulk

On Mon, Oct 23, 2023 at 02:43:27PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got conflicts in:
> 
>   arch/ia64/kernel/setup.c
>   drivers/firmware/pcdp.c
> 
> between commit:
> 
>   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
> 
> from the asm-generic tree and commits:
> 
>   8a736ddfc861 ("vgacon: rework screen_info #ifdef checks")
>   acfc78823326 ("vgacon: remove screen_info dependency")
>   555624c0d10b ("vgacon: clean up global screen_info instances")
> 
> from the tty tree.
> 
> I fixed it up (I deleted the files) 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.

Deleting the files are fine, thanks!

greg k-h