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  linux-cve-announce  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date:   Mon, 29 Apr 2019 11:54:02 +1000
From:   Stephen Rothwell <>
To:     David Miller <>,
        Networking <>,
        Kalle Valo <>,
        Wireless <>
Cc:     Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Greg Kroah-Hartman <>,
        Luca Coelho <>
Subject: linux-next: manual merge of the net-next tree with the
 wireless-drivers tree

Hi all,

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


between commits:

  154d4899e411 ("iwlwifi: mvm: properly check debugfs dentry before using it")
  d156e67d3f58 ("iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register()")

from the wireless-drivers tree and commit:

  c9af7528c331 ("iwlwifi: mvm: no need to check return value of debugfs_create functions")

from the net-next tree.

I fixed it up (the latter removed the code modified by the former, so I
just did that) 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