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 18:43:18 +1100
From:   Stephen Rothwell <>
To:     Andrew Morton <>,
        Theodore Ts'o <>
Cc:     Linux-Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Mel Gorman <>,
        Christoph Hellwig <>,
        Andreas Gruenbacher <>
Subject: linux-next: manual merge of the akpm-current tree with the ext4

Hi Andrew,

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


between commit:

  545052e9e35a ("ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA")

from the ext4 tree and commit:

  f7d4010a3383 ("mm, pagevec: remove cold parameter for pagevecs")

from the akpm-current tree.

I fixed it up (the former removed the reference to pagevec_init that
was updated in 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