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  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, 27 Nov 2017 11:06:48 +1100
From:   Stephen Rothwell <>
To:     Wim Van Sebroeck <>
Cc:     Linux-Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Kees Cook <>,
        Christophe Leroy <>,
        Guenter Roeck <>
Subject: linux-next: manual merge of the watchdog tree with Linus' tree

Hi Wim,

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


between commit:

  e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")

from Linus' tree and commit:

  fbdec655375c ("watchdog: mpc8xxx: use the core worker function")

from the watchdog tree.

I fixed it up (I used the latter which removed the setup_timer call) 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