From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Subject: Re: linux-next: manual merge of the staging tree with the clk tree
Date: Tue, 4 Oct 2022 10:25:50 +0200 [thread overview]
Message-ID: <YzvuDr3Z8wpGp5JH@kroah.com> (raw)
In-Reply-To: <20221004173125.4ba8d782@canb.auug.org.au>
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:
>
> 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/
Fixup looks good to me, thanks!
greg k-h
prev parent reply other threads:[~2022-10-04 8:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 6:31 linux-next: manual merge of the staging tree with the clk tree Stephen Rothwell
2022-10-04 8:25 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YzvuDr3Z8wpGp5JH@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shubhrajyoti.datta@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox