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

2023-11-27 Thread Uwe Kleine-König
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()

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

2023-11-27 Thread Michael Ellerman
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 hv

linux-next: manual merge of the tty tree with the powerpc tree

2023-11-26 Thread Stephen Rothwell
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 tre

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

2023-08-22 Thread Michael Ellerman
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_im

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

2023-08-22 Thread Greg KH
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 ("p

linux-next: manual merge of the tty tree with the powerpc tree

2023-08-17 Thread Stephen Rothwell
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: Remov

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

2011-09-21 Thread Greg KH
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 a

linux-next: manual merge of the tty tree with the powerpc tree

2011-09-20 Thread Stephen Rothwell
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