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:   Mon, 12 Aug 2019 10:17:38 +1000
From:   Stephen Rothwell <>
To:     David Howells <>,
        David Miller <>,
        Networking <>
Cc:     Linux Next Mailing List <>,
        Linux Kernel Mailing List <>
Subject: linux-next: manual merge of the afs tree with the net tree

Hi all,

Today's linux-next merge of the afs tree got conflicts in:


between commits:

  730c5fd42c1e ("rxrpc: Fix local endpoint refcounting")
  e8c3af6bb33a ("rxrpc: Don't bother generating maxSkew in the ACK packet")

from the net tree and commits:

  5c2833938bf5 ("rxrpc: Fix local endpoint refcounting")
  49bbdebb23f2 ("rxrpc: Don't bother generating maxSkew in the ACK packet")

from the afs tree.

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

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists