* linux-next: manual merge of the rockchip tree with the renesas tree
@ 2018-05-02 22:36 Stephen Rothwell
2018-05-03 6:43 ` Simon Horman
2018-05-16 1:39 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2018-05-02 22:36 UTC (permalink / raw)
To: Heiko Stuebner, Simon Horman
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Kuninori Morimoto, Ezequiel Garcia
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
Hi Heiko,
Today's linux-next merge of the rockchip tree got a conflict in:
arch/arm64/configs/defconfig
between commits:
93f7bfd930c0 ("arm64: defconfig: makes SND_SIMPLE_CARD to module")
ddf3fa8b8a16 ("arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD")
from the renesas tree and commit:
e9cfce4195ec ("arm64: defconfig: Enable HID over I2C drivers")
from the rockchip 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 arch/arm64/configs/defconfig
index 7930caf5dde4,34037d24fbf4..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -158,9 -157,9 +158,10 @@@ CONFIG_BT_HIDP=
# CONFIG_BT_LE is not set
CONFIG_BT_LEDS=y
# CONFIG_BT_DEBUGFS is not set
+ CONFIG_BT_HCIBTUSB=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_BCM=y
CONFIG_CFG80211=m
CONFIG_MAC80211=m
CONFIG_MAC80211_LEDS=y
@@@ -443,8 -447,8 +451,9 @@@ CONFIG_SND_BCM2835_SOC_I2S=
CONFIG_SND_SOC_SAMSUNG=y
CONFIG_SND_SOC_RCAR=m
CONFIG_SND_SOC_AK4613=m
-CONFIG_SND_SIMPLE_CARD=y
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_AUDIO_GRAPH_CARD=m
+ CONFIG_I2C_HID=m
CONFIG_USB=y
CONFIG_USB_OTG=y
CONFIG_USB_XHCI_HCD=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the rockchip tree with the renesas tree
2018-05-02 22:36 linux-next: manual merge of the rockchip tree with the renesas tree Stephen Rothwell
@ 2018-05-03 6:43 ` Simon Horman
2018-05-16 1:39 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Simon Horman @ 2018-05-03 6:43 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Heiko Stuebner, Linux-Next Mailing List,
Linux Kernel Mailing List, Kuninori Morimoto, Ezequiel Garcia,
Arnd Bergmann, Olof Johansson, Kevin Hilman, Linux-Renesas
[CC Arnd, Olof, Kevin, Linux-Renesas-SoC ML]
Thanks Stephen,
the resolution seems correct to me.
Arnd, Olof, Kevin, how would you like to handle this?
I'd be quite happy for the commits in my tree, the first two mentioned
below to be merged elsewhere or deferred until the next release if
it would make things easier for you.
On Thu, May 03, 2018 at 08:36:54AM +1000, Stephen Rothwell wrote:
> Hi Heiko,
>
> Today's linux-next merge of the rockchip tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commits:
>
> 93f7bfd930c0 ("arm64: defconfig: makes SND_SIMPLE_CARD to module")
> ddf3fa8b8a16 ("arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD")
>
> from the renesas tree and commit:
>
> e9cfce4195ec ("arm64: defconfig: Enable HID over I2C drivers")
>
> from the rockchip 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 arch/arm64/configs/defconfig
> index 7930caf5dde4,34037d24fbf4..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -158,9 -157,9 +158,10 @@@ CONFIG_BT_HIDP=
> # CONFIG_BT_LE is not set
> CONFIG_BT_LEDS=y
> # CONFIG_BT_DEBUGFS is not set
> + CONFIG_BT_HCIBTUSB=m
> CONFIG_BT_HCIUART=m
> CONFIG_BT_HCIUART_LL=y
> +CONFIG_BT_HCIUART_BCM=y
> CONFIG_CFG80211=m
> CONFIG_MAC80211=m
> CONFIG_MAC80211_LEDS=y
> @@@ -443,8 -447,8 +451,9 @@@ CONFIG_SND_BCM2835_SOC_I2S=
> CONFIG_SND_SOC_SAMSUNG=y
> CONFIG_SND_SOC_RCAR=m
> CONFIG_SND_SOC_AK4613=m
> -CONFIG_SND_SIMPLE_CARD=y
> +CONFIG_SND_SIMPLE_CARD=m
> +CONFIG_SND_AUDIO_GRAPH_CARD=m
> + CONFIG_I2C_HID=m
> CONFIG_USB=y
> CONFIG_USB_OTG=y
> CONFIG_USB_XHCI_HCD=y
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the rockchip tree with the renesas tree
2018-05-02 22:36 linux-next: manual merge of the rockchip tree with the renesas tree Stephen Rothwell
2018-05-03 6:43 ` Simon Horman
@ 2018-05-16 1:39 ` Stephen Rothwell
2018-05-16 6:44 ` Simon Horman
1 sibling, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2018-05-16 1:39 UTC (permalink / raw)
To: Simon Horman, Olof Johansson, Arnd Bergmann, ARM
Cc: Heiko Stuebner, Linux-Next Mailing List,
Linux Kernel Mailing List, Kuninori Morimoto, Ezequiel Garcia
[-- Attachment #1: Type: text/plain, Size: 1882 bytes --]
Hi all,
On Thu, 3 May 2018 08:36:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rockchip tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commits:
>
> 93f7bfd930c0 ("arm64: defconfig: makes SND_SIMPLE_CARD to module")
> ddf3fa8b8a16 ("arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD")
>
> from the renesas tree and commit:
>
> e9cfce4195ec ("arm64: defconfig: Enable HID over I2C drivers")
>
> from the rockchip 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 arch/arm64/configs/defconfig
> index 7930caf5dde4,34037d24fbf4..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -158,9 -157,9 +158,10 @@@ CONFIG_BT_HIDP=
> # CONFIG_BT_LE is not set
> CONFIG_BT_LEDS=y
> # CONFIG_BT_DEBUGFS is not set
> + CONFIG_BT_HCIBTUSB=m
> CONFIG_BT_HCIUART=m
> CONFIG_BT_HCIUART_LL=y
> +CONFIG_BT_HCIUART_BCM=y
> CONFIG_CFG80211=m
> CONFIG_MAC80211=m
> CONFIG_MAC80211_LEDS=y
> @@@ -443,8 -447,8 +451,9 @@@ CONFIG_SND_BCM2835_SOC_I2S=
> CONFIG_SND_SOC_SAMSUNG=y
> CONFIG_SND_SOC_RCAR=m
> CONFIG_SND_SOC_AK4613=m
> -CONFIG_SND_SIMPLE_CARD=y
> +CONFIG_SND_SIMPLE_CARD=m
> +CONFIG_SND_AUDIO_GRAPH_CARD=m
> + CONFIG_I2C_HID=m
> CONFIG_USB=y
> CONFIG_USB_OTG=y
> CONFIG_USB_XHCI_HCD=y
This is now a conflict between the renesas tree and the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the rockchip tree with the renesas tree
2018-05-16 1:39 ` Stephen Rothwell
@ 2018-05-16 6:44 ` Simon Horman
0 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2018-05-16 6:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, Heiko Stuebner,
Linux-Next Mailing List, Linux Kernel Mailing List,
Kuninori Morimoto, Ezequiel Garcia
Thanks Stephen,
On Wed, May 16, 2018 at 11:39:18AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 3 May 2018 08:36:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the rockchip tree got a conflict in:
> >
> > arch/arm64/configs/defconfig
> >
> > between commits:
> >
> > 93f7bfd930c0 ("arm64: defconfig: makes SND_SIMPLE_CARD to module")
> > ddf3fa8b8a16 ("arm64: defconfig: Enable CONFIG_SND_AUDIO_GRAPH_CARD")
> >
> > from the renesas tree and commit:
> >
> > e9cfce4195ec ("arm64: defconfig: Enable HID over I2C drivers")
> >
> > from the rockchip 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.
The resolution looks correct to me.
As the renesas tree reaches Linus via the arm-soc tree I believe
this is likely best resolved by the arm-soc maintainers once I
send them a pull-request for the renesas tree. And I do not expect
it to bubble-up to Linus.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc arch/arm64/configs/defconfig
> > index 7930caf5dde4,34037d24fbf4..000000000000
> > --- a/arch/arm64/configs/defconfig
> > +++ b/arch/arm64/configs/defconfig
> > @@@ -158,9 -157,9 +158,10 @@@ CONFIG_BT_HIDP=
> > # CONFIG_BT_LE is not set
> > CONFIG_BT_LEDS=y
> > # CONFIG_BT_DEBUGFS is not set
> > + CONFIG_BT_HCIBTUSB=m
> > CONFIG_BT_HCIUART=m
> > CONFIG_BT_HCIUART_LL=y
> > +CONFIG_BT_HCIUART_BCM=y
> > CONFIG_CFG80211=m
> > CONFIG_MAC80211=m
> > CONFIG_MAC80211_LEDS=y
> > @@@ -443,8 -447,8 +451,9 @@@ CONFIG_SND_BCM2835_SOC_I2S=
> > CONFIG_SND_SOC_SAMSUNG=y
> > CONFIG_SND_SOC_RCAR=m
> > CONFIG_SND_SOC_AK4613=m
> > -CONFIG_SND_SIMPLE_CARD=y
> > +CONFIG_SND_SIMPLE_CARD=m
> > +CONFIG_SND_AUDIO_GRAPH_CARD=m
> > + CONFIG_I2C_HID=m
> > CONFIG_USB=y
> > CONFIG_USB_OTG=y
> > CONFIG_USB_XHCI_HCD=y
>
> This is now a conflict between the renesas tree and the arm-soc tree.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-16 6:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-02 22:36 linux-next: manual merge of the rockchip tree with the renesas tree Stephen Rothwell
2018-05-03 6:43 ` Simon Horman
2018-05-16 1:39 ` Stephen Rothwell
2018-05-16 6:44 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox