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>] [day] [month] [year] [list]
Date:   Thu, 2 Nov 2017 15:20:58 +1100
From:   Stephen Rothwell <>
To:     Greg KH <>, Arnd Bergmann <>,
        Thomas Gleixner <>,
        Ingo Molnar <>, "H. Peter Anvin" <>,
        Peter Zijlstra <>
Cc:     Linux-Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Kees Cook <>
Subject: linux-next: manual merge of the char-misc tree with the tip tree

Hi all,

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


between commit:

  8776fe75dc0e ("lkdtm, kprobes: Convert from jprobes to kprobes")

from the tip tree and commits:

  31c5c870a112 ("lkdtm: Convert from jprobe to kprobe")
  75f98b7ab748 ("lkdtm: Constify the crashtypes table")

from the char-misc tree.

[8776fe75dc0e and 31c5c870a112 are the same patch]

I fixed it up (I just usted the latter) 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.

Stephen Rothwell

Powered by blists - more mailing lists