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

From: Greg KH <[email-masked]>
Date: Tue, 24 Jan 2023 18:01:55 +0100

On Wed, Jan 25, 2023 at 12:42:19AM +0800, Xu Yilun wrote:
> On 2023-01-23 at 12:45:02 +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the fpga tree got conflicts in:
> > 
> >   drivers/fpga/dfl.c
> >   drivers/fpga/dfl.h
> > 
> > between commit:
> > 
> >   4747ab89b4a6 ("fpga: dfl: add basic support for DFHv1")
> > 
> > from the tty tree and commits:
> > 
> >   3afe90d5b7a4 ("fpga: dfl: kernel-doc corrections")
> >   e5541aae450e ("fpga: dfl: more kernel-doc corrections")
> > 
> > from the fpga tree.
> 
> 
> Hi Greg:
> 
> I could re-apply the 2 FPGA patches based on the following series on
> tty-next tree:
> 
> 46879f71061a ("Documentation: fpga: dfl: Add documentation for DFHv1")
> 0926d8d52d42 ("fpga: dfl: Add DFHv1 Register Definitions")
> 4747ab89b4a6 ("fpga: dfl: add basic support for DFHv1")
> e34a79d0b320 ("tty: serial: 8250: add DFL bus driver for Altera 16550")
> 
> Then there will be no conflict for my pull request.

Ok, that seems reasonable.  If there's anything you think I should
change in the tty tree, please let me know.

thanks,

greg k-h