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

lists.openwall.net		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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20201102123841.39eb4216@canb.auug.org.au>
Date:   Mon, 2 Nov 2020 12:38:41 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Helge Deller <deller@....de>,
        Parisc List <linux-parisc@...r.kernel.org>,
        Arnd Bergmann <arnd@...db.de>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: 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.

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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped