lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Tue, 15 Dec 2020 05:45:49 +0100
From:   Helge Deller <>
To:     Stephen Rothwell <>,
        Parisc List <>,
        Arnd Bergmann <>
Cc:     Linux Kernel Mailing List <>,
        Linux Next Mailing List <>
Subject: 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 legacy_timer_tick")
>> from the asm-generic tree and commit:
>>   3b7ab4a74a2d ("parisc: Switch to clockevent based timers")
>> from the parisc-hd tree.
>> I fixed it up (I effectively reverted the former commit) 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.
> This is just a reminder that this conflict still exists.

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.


Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)

Powered by blists - more mailing lists