linux-kernel - linux-next: manual merge of the tip tree with the jc

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]

Message-ID: <20210603140411.79f67380@canb.auug.org.au>
Date:   Thu, 3 Jun 2021 14:04:11 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Jonathan Corbet <corbet@....net>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tiezhu Yang <yangtiezhu@...ngson.cn>
Subject: linux-next: manual merge of the tip tree with the jc_docs tree

Hi all,

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

  samples/kprobes/kprobe_example.c

between commits:

  61fa308f23b5 ("samples/kprobes: Fix typo in handler_fault()")
  db1ea668843e ("samples/kprobes: Fix typo in handler_post()")

from the jc_docs tree and commit:

  ec6aba3d2be1 ("kprobes: Remove kprobe::fault_handler")

from the tip tree.

I fixed it up (the latter removed some code updated by the former) 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