Re: linux-next: manual merge of the tty tree with the powerpc tree
Hello,
On Mon, Nov 27, 2023 at 10:00:58PM +1100, Michael Ellerman wrote:
> Stephen Rothwell writes:
> > Hi all,
> >
> > Today's linux-next merge of the tty tree got a conflict in:
> >
> > drivers/tty/hvc/hvc_console.h
> >
> > between commit:
> >
> > c9e38dc90e1c ("tty: hvc: Make hvc_remove() return no value")
> >
> > from the powerpc tree and commit:
> >
> > 7f30c19caf94 ("tty: hvc: Make hvc_remove() return no value")
> >
> > from the tty tree.
> >
> > These are slightly different versions of the same patch.
>
> I'll drop it from my tree.
FTR: Regarding the slightly difference: The variant in the tty tree is
the better one. So nothing to do for Greg (or me) here.
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König|
Industrial Linux Solutions | https://www.pengutronix.de/ |
signature.asc
Description: PGP signature
Re: linux-next: manual merge of the tty tree with the powerpc tree
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/hvc/hvc_console.h
>
> between commit:
>
> c9e38dc90e1c ("tty: hvc: Make hvc_remove() return no value")
>
> from the powerpc tree and commit:
>
> 7f30c19caf94 ("tty: hvc: Make hvc_remove() return no value")
>
> from the tty tree.
>
> These are slightly different versions of the same patch.
I'll drop it from my tree.
cheers
Re: linux-next: manual merge of the tty tree with the powerpc tree
Greg KH writes:
> On Fri, Aug 18, 2023 at 02:58:26PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tty tree got a conflict in:
>>
>> arch/powerpc/include/asm/fs_pd.h
>>
>> between commits:
>>
>> e6e077cb2aa4 ("powerpc/include: Declare mpc8xx_immr in 8xx_immap.h")
>> fecc436a97af ("powerpc/include: Remove mpc8260.h and m82xx_pci.h")
>> fbbf4280dae4 ("powerpc/8xx: Remove immr_map() and immr_unmap()")
>> 7768716d2f19 ("powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()")
>>
>> from the powerpc tree and commit:
>>
>> c2d6c1b4f034 ("serial: cpm_uart: Use get_baudrate() instead of
>> uart_baudrate()")
>>
>> from the tty 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.
>>
>> Note that after all the above are applied, it looks like this file can
>> be removed completely as nothing in the tree includes it any more.
>
> Thanks for the notice, I'll let the ppc developers remove it as it's in
> their tree.
Ack.
cheers
Re: linux-next: manual merge of the tty tree with the powerpc tree
On Fri, Aug 18, 2023 at 02:58:26PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> arch/powerpc/include/asm/fs_pd.h
>
> between commits:
>
> e6e077cb2aa4 ("powerpc/include: Declare mpc8xx_immr in 8xx_immap.h")
> fecc436a97af ("powerpc/include: Remove mpc8260.h and m82xx_pci.h")
> fbbf4280dae4 ("powerpc/8xx: Remove immr_map() and immr_unmap()")
> 7768716d2f19 ("powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()")
>
> from the powerpc tree and commit:
>
> c2d6c1b4f034 ("serial: cpm_uart: Use get_baudrate() instead of
> uart_baudrate()")
>
> from the tty 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.
>
> Note that after all the above are applied, it looks like this file can
> be removed completely as nothing in the tree includes it any more.
Thanks for the notice, I'll let the ppc developers remove it as it's in
their tree.
thanks,
greg k-h
Re: linux-next: manual merge of the tty tree with the powerpc tree
On Wed, Sep 21, 2011 at 03:01:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got conflicts in
> arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between
> commit c26afe9e8591 ("powerpc/ps3: Add gelic udbg driver") from the
> powerpc tree and commit dcd83aaff1c8 ("tty/powerpc: introduce the ePAPR
> embedded hypervisor byte channel driver") from the tty tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks, that looks fine to me.
greg k-h
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
