Re: linux-next: manual merge of the staging tree with the clk tree
From: Greg KH
Date: Tue Oct 04 2022 - 04:26:04 EST
On Tue, Oct 04, 2022 at 05:31:25PM +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the staging tree got conflicts in:
> 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.
> 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/
Fixup looks good to me, thanks!