All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the usb tree with the mips tree
@ 2015-06-03  6:48 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2015-06-03  6:48 UTC (permalink / raw)
  To: Greg KH, Ralf Baechle
  Cc: linux-next, linux-kernel, Andrew Bresticker, Heikki Krogerus,
	Felipe Balbi

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/phy/Makefile between commit d38dee131827 ("PHY: Add driver for
Pistachio USB2.0 PHY") from the mips tree and commit 1c14905ef951
("phy: add driver for TI TUSB1210 ULPI PHY") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/phy/Makefile
index 75a37dc952f5,0a2041803135..000000000000
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -40,4 -40,4 +40,5 @@@ obj-$(CONFIG_PHY_STIH41X_USB)		+= phy-s
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs.o
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-20nm.o
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-14nm.o
 +obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
+ obj-$(CONFIG_PHY_TUSB1210)		+= phy-tusb1210.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the mips tree
  2017-09-04  5:51 Stephen Rothwell
@ 2017-09-04  9:17 ` Greg KH
  0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2017-09-04  9:17 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Ralf Baechle, James Hogan, Linux-Next Mailing List,
	Linux Kernel Mailing List, Hauke Mehrtens, Chunfeng Yun,
	Kishon Vijay Abraham I

On Mon, Sep 04, 2017 at 03:51:32PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/phy/Makefile
> 
> between commit:
> 
>   0ab3aa747f26 ("phy: Add an USB PHY driver for the Lantiq SoCs using the RCU module")
> 
> from the mips tree and commit:
> 
>   cd4ec4b03dc1 ("phy: phy-mt65xx-usb3: add mediatek directory and rename file")
> 
> from the usb 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/phy/Makefile
> index a8b9439a5d8e,06f3c500030d..000000000000
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@@ -4,12 -4,12 +4,12 @@@
>   
>   obj-$(CONFIG_GENERIC_PHY)		+= phy-core.o
>   obj-$(CONFIG_PHY_LPC18XX_USB_OTG)	+= phy-lpc18xx-usb-otg.o
> - obj-$(CONFIG_PHY_MT65XX_USB3)		+= phy-mt65xx-usb3.o
>   obj-$(CONFIG_PHY_XGENE)			+= phy-xgene.o
>   obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
>  -
>   obj-$(CONFIG_ARCH_SUNXI)		+= allwinner/
>   obj-$(CONFIG_ARCH_MESON)		+= amlogic/
>  +obj-$(CONFIG_LANTIQ)			+= lantiq/
> + obj-$(CONFIG_ARCH_MEDIATEK)		+= mediatek/
>   obj-$(CONFIG_ARCH_RENESAS)		+= renesas/
>   obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
>   obj-$(CONFIG_ARCH_TEGRA)		+= tegra/


Looks good to me, thanks!

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the usb tree with the mips tree
@ 2017-09-04  5:51 Stephen Rothwell
  2017-09-04  9:17 ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2017-09-04  5:51 UTC (permalink / raw)
  To: Greg KH, Ralf Baechle, James Hogan
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Hauke Mehrtens, Chunfeng Yun, Kishon Vijay Abraham I

Hi Greg,

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

  drivers/phy/Makefile

between commit:

  0ab3aa747f26 ("phy: Add an USB PHY driver for the Lantiq SoCs using the RCU module")

from the mips tree and commit:

  cd4ec4b03dc1 ("phy: phy-mt65xx-usb3: add mediatek directory and rename file")

from the usb 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/phy/Makefile
index a8b9439a5d8e,06f3c500030d..000000000000
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -4,12 -4,12 +4,12 @@@
  
  obj-$(CONFIG_GENERIC_PHY)		+= phy-core.o
  obj-$(CONFIG_PHY_LPC18XX_USB_OTG)	+= phy-lpc18xx-usb-otg.o
- obj-$(CONFIG_PHY_MT65XX_USB3)		+= phy-mt65xx-usb3.o
  obj-$(CONFIG_PHY_XGENE)			+= phy-xgene.o
  obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
 -
  obj-$(CONFIG_ARCH_SUNXI)		+= allwinner/
  obj-$(CONFIG_ARCH_MESON)		+= amlogic/
 +obj-$(CONFIG_LANTIQ)			+= lantiq/
+ obj-$(CONFIG_ARCH_MEDIATEK)		+= mediatek/
  obj-$(CONFIG_ARCH_RENESAS)		+= renesas/
  obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
  obj-$(CONFIG_ARCH_TEGRA)		+= tegra/

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the mips tree
  2015-06-04  8:39 Stephen Rothwell
@ 2015-06-05 10:53 ` Greg KH
  0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2015-06-05 10:53 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Ralf Baechle, linux-next, linux-kernel, Andrew Bresticker,
	Brian Norris, Kishon Vijay Abraham I

On Thu, Jun 04, 2015 at 06:39:33PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/phy/Makefile between commit d38dee131827 ("PHY: Add driver for
> Pistachio USB2.0 PHY") from the mips tree and commit 0d486806ffd0 ("phy:
> add Broadcom SATA3 PHY driver for Broadcom STB SoCs") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/phy/Makefile
> index 75a37dc952f5,bc92b427e5ca..000000000000
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@@ -40,4 -40,5 +40,6 @@@ obj-$(CONFIG_PHY_STIH41X_USB)		+= phy-s
>   obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs.o
>   obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-20nm.o
>   obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-14nm.o
>  +obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
> + obj-$(CONFIG_PHY_TUSB1210)		+= phy-tusb1210.o
> + obj-$(CONFIG_PHY_BRCMSTB_SATA)		+= phy-brcmstb-sata.o


Thanks, that looks correct to me.

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the usb tree with the mips tree
@ 2015-06-04  8:39 Stephen Rothwell
  2015-06-05 10:53 ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2015-06-04  8:39 UTC (permalink / raw)
  To: Greg KH, Ralf Baechle
  Cc: linux-next, linux-kernel, Andrew Bresticker, Brian Norris,
	Kishon Vijay Abraham I

[-- Attachment #1: Type: text/plain, Size: 990 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/phy/Makefile between commit d38dee131827 ("PHY: Add driver for
Pistachio USB2.0 PHY") from the mips tree and commit 0d486806ffd0 ("phy:
add Broadcom SATA3 PHY driver for Broadcom STB SoCs") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/phy/Makefile
index 75a37dc952f5,bc92b427e5ca..000000000000
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -40,4 -40,5 +40,6 @@@ obj-$(CONFIG_PHY_STIH41X_USB)		+= phy-s
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs.o
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-20nm.o
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-14nm.o
 +obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
+ obj-$(CONFIG_PHY_TUSB1210)		+= phy-tusb1210.o
+ obj-$(CONFIG_PHY_BRCMSTB_SATA)		+= phy-brcmstb-sata.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the mips tree
  2010-10-18  6:09 Stephen Rothwell
@ 2010-10-19 15:47 ` Greg KH
  0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2010-10-19 15:47 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, David Daney, Ralf Baechle, Anatolij Gustschin

On Mon, Oct 18, 2010 at 05:09:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/Makefile between commit
> cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
> for OCTEON II SOCs") from the mips tree and commit
> f668f1e9868f9bc1bed3d5df1701879ac89cc3ed ("USB: add platform glue driver
> for FSL USB DR controller") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks for the fix, looks fine.

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the usb tree with the mips tree
  2010-10-18  6:06 Stephen Rothwell
@ 2010-10-19 15:46 ` Greg KH
  0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2010-10-19 15:46 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Anatolij Gustschin, David Daney, Ralf Baechle

On Mon, Oct 18, 2010 at 05:06:19PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/Kconfig between commit
> cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
> for OCTEON II SOCs") from the mips tree and commit
> c67a807cb13570bfc7b78f53158d14a433c59591 ("USB: add USB EHCI support for
> MPC5121 SoC") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks for the fix, looks fine.

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the usb tree with the mips tree
@ 2010-10-18  6:09 Stephen Rothwell
  2010-10-19 15:47 ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2010-10-18  6:09 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, David Daney, Ralf Baechle, Anatolij Gustschin

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Makefile between commit
cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
for OCTEON II SOCs") from the mips tree and commit
f668f1e9868f9bc1bed3d5df1701879ac89cc3ed ("USB: add platform glue driver
for FSL USB DR controller") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/host/Makefile
index 36099ce,91c5a1b..0000000
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@@ -33,5 -33,4 +33,5 @@@ obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66
  obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
  obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o
  obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o
 +obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
- 
+ obj-$(CONFIG_USB_FSL_MPH_DR_OF)	+= fsl-mph-dr-of.o

^ permalink raw reply	[flat|nested] 9+ messages in thread
* linux-next: manual merge of the usb tree with the mips tree
@ 2010-10-18  6:06 Stephen Rothwell
  2010-10-19 15:46 ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2010-10-18  6:06 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Anatolij Gustschin, David Daney, Ralf Baechle

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Kconfig between commit
cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
for OCTEON II SOCs") from the mips tree and commit
c67a807cb13570bfc7b78f53158d14a433c59591 ("USB: add USB EHCI support for
MPC5121 SoC") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/host/Kconfig
index a03d688,bf2e7d2..0000000
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -93,7 -93,8 +93,8 @@@ config USB_EHCI_TT_NEWSCHE
  
  config USB_EHCI_BIG_ENDIAN_MMIO
  	bool
- 	depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || XPS_USB_HCD_XILINX || CPU_CAVIUM_OCTEON)
+ 	depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || ARCH_IXP4XX || \
 -				    XPS_USB_HCD_XILINX || PPC_MPC512x)
++				    XPS_USB_HCD_XILINX || PPC_MPC512x || CPU_CAVIUM_OCTEON)
  	default y
  
  config USB_EHCI_BIG_ENDIAN_DESC

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-09-04  9:19 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-03  6:48 linux-next: manual merge of the usb tree with the mips tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2017-09-04  5:51 Stephen Rothwell
2017-09-04  9:17 ` Greg KH
2015-06-04  8:39 Stephen Rothwell
2015-06-05 10:53 ` Greg KH
2010-10-18  6:09 Stephen Rothwell
2010-10-19 15:47 ` Greg KH
2010-10-18  6:06 Stephen Rothwell
2010-10-19 15:46 ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.