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:   Fri, 3 Nov 2017 19:07:29 +1100
From:   Stephen Rothwell <>
To:     Andrew Morton <>,
        David Miller <>,
        Networking <>
Cc:     Linux-Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Jakub Kicinski <>,
        Mel Gorman <>
Subject: linux-next: manual merge of the akpm-current tree with the net-next

Hi Andrew,

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


between commits:

  5f0ca2fb71e2 ("nfp: handle page allocation failures")
  790a39917183 ("nfp: switch to dev_alloc_page()")
  16f50cda06ae ("nfp: use a counter instead of log message for allocation failures")

from the net-next tree and commit:

  0432d14c45bb ("mm: remove __GFP_COLD")

from the akpm-current tree.

I fixed it up (the former series removes the use of alloc_page() from
nfp_net_napi_alloc_one()) 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