Received-SPF: pass (google.com: domain of linux-kernel+bounces-19159-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Feedback-ID: i787e41f1:Fastmail
Date: Mon, 8 Jan 2024 08:53:40 +0100
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Yury Norov <yury.norov@gmail.com>,
	Hugo Villeneuve <hvilleneuve@dimonoff.com>,
	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 bitmap tree with the tty tree
Message-ID: <2024010830-swimsuit-ferment-8b88@gregkh>
References: <20240108143627.29ac91fe@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240108143627.29ac91fe@canb.auug.org.au>

On Mon, Jan 08, 2024 at 02:36:27PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the bitmap tree got a conflict in:
> 
>   drivers/tty/serial/sc16is7xx.c
> 
> between commits:
> 
>   8a1060ce9749 ("serial: sc16is7xx: fix invalid sc16is7xx_lines bitfield in case of probe error")
>   3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by using one regmap per port")
> 
> from the tty tree and commit:
> 
>   e63a961be48f ("serial: sc12is7xx: optimize sc16is7xx_alloc_line()")
> 
> from the bitmap tree.
> 
> I fixed it up (the former removed the function updated by the latter) 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.

Fix looks coks correct, thanks.

greg k-h