linux-kernel - linux-next: manual merge of the clockevents tree with the tip 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>] [day] [month] [year] [list]

Date:   Mon, 26 Aug 2019 15:08:33 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Lezcano <daniel.lezcano@...aro.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Frederic Weisbecker <frederic@...nel.org>
Subject: linux-next: manual merge of the clockevents tree with the tip tree

Hi all,

Today's linux-next merge of the clockevents tree got a conflict in:

  kernel/time/posix-timers.c

between commits:

  ec8f954a40da ("posix-timers: Use a callback for cancel synchronization on PREEMPT_RT")
  0bee3b601b77 ("hrtimer: Improve comments on handling priority inversion against softirq kthread")

from the tip tree and commit:

  08a3c192c93f ("posix-timers: Prepare for PREEMPT_RT")

from the clockevents tree.

I fixed it up (I just used the tip tree version) 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