lists.openwall.net   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, 1 May 2017 14:09:49 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Guenter Roeck <groeck@...omium.org>,
        Gilad Ben-Yossef <gilad@...yossef.com>,
        Michael Zoran <mzoran@...wfest.net>
Subject: linux-next: manual merge of the staging tree with the usb tree

Hi Greg,

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

  drivers/staging/Makefile

between commit:

  f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")

from the usb tree and commit:

  051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
  abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")

from the staging tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/Makefile
index 682127c20da5,422fae4ea0f3..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -41,4 -42,5 +43,4 @@@ obj-$(CONFIG_MOST)		+= most
  obj-$(CONFIG_KS7010)		+= ks7010/
  obj-$(CONFIG_GREYBUS)		+= greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/
- obj-$(CONFIG_SND_BCM2835)	+= bcm2835-audio/
+ obj-$(CONFIG_CRYPTO_DEV_CCREE)	+= ccree/
 -

Powered by blists - more mailing lists