linux-kernel - linux-next: manual merge of the staging tree with the clk tree

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]

Message-ID: <20221004173125.4ba8d782@canb.auug.org.au>
Date:   Tue, 4 Oct 2022 17:31:25 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Mike Turquette <mturquette@...libre.com>,
        Stephen Boyd <sboyd@...nel.org>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Shubhrajyoti Datta <shubhrajyoti.datta@...inx.com>
Subject: linux-next: manual merge of the staging tree with the clk tree

Hi all,

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

  drivers/staging/Kconfig
  drivers/staging/Makefile

between commit:

  c822490f52da ("clk: clocking-wizard: Move clocking-wizard out")

from the clk tree and commit:

  db65becab2a3 ("staging: fwserial: delete the 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/Kconfig
index 211436b40c0a,64a531accd72..000000000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -60,8 -60,8 +60,6 @@@ source "drivers/staging/board/Kconfig
  
  source "drivers/staging/gdm724x/Kconfig"
  
- source "drivers/staging/fwserial/Kconfig"
 -source "drivers/staging/clocking-wizard/Kconfig"
--
  source "drivers/staging/fbtft/Kconfig"
  
  source "drivers/staging/most/Kconfig"
diff --cc drivers/staging/Makefile
index f1be26a5f222,6af299b9045b..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -20,7 -20,7 +20,6 @@@ obj-$(CONFIG_USB_EMXX)		+= emxx_udc
  obj-$(CONFIG_MFD_NVEC)		+= nvec/
  obj-$(CONFIG_STAGING_BOARD)	+= board/
  obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/
- obj-$(CONFIG_FIREWIRE_SERIAL)	+= fwserial/
 -obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)	+= clocking-wizard/
  obj-$(CONFIG_FB_TFT)		+= fbtft/
  obj-$(CONFIG_MOST)		+= most/
  obj-$(CONFIG_KS7010)		+= ks7010/

Content of type "application/pgp-signature" skipped