Re: linux-next: manual merge of the bitmap tree with the tty tree

[Greg KH <greg@kroah.com>]

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