Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree

Hi Helge, On Tue, 15 Dec 2020 05:45:49 +0100 Helge Deller wrote: > > I dropped the patch from the parisc-hd tree for now - > it needs more work and will not be part of the next merge window. Thanks for letting me know. -- Cheers, Stephen Rothwell pgpNgyoZ38GwF.pgp Description: OpenPGP

Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree

On 12/14/20 8:48 PM, Stephen Rothwell wrote: > Hi all, > > On Mon, 2 Nov 2020 12:38:41 +1100 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the parisc-hd tree got a conflict in: >> >> arch/parisc/kernel/time.c >> >> between commit: >> >> 686092e7daaa ("parisc: use

Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree

Hi all, On Mon, 2 Nov 2020 12:38:41 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the parisc-hd tree got a conflict in: > > arch/parisc/kernel/time.c > > between commit: > > 686092e7daaa ("parisc: use legacy_timer_tick") > > from the asm-generic tree and commit: > >

linux-next: manual merge of the parisc-hd tree with the asm-generic tree

Hi all, Today's linux-next merge of the parisc-hd tree got a conflict in: arch/parisc/kernel/time.c between commit: 686092e7daaa ("parisc: use legacy_timer_tick") from the asm-generic tree and commit: 3b7ab4a74a2d ("parisc: Switch to clockevent based timers") from the parisc-hd tree.