linux-next: manual merge of the char-misc tree with the arm-soc tree

linux-next: manual merge of the char-misc tree with the arm-soc tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/misc/Kconfig
  drivers/misc/Makefile

between commit:

  524feb799408 ("soc: add aspeed folder and misc drivers")

from the arm-soc tree and commit:

  01c60dcea9f7 ("drivers/misc: Add Aspeed P2A control driver")

from the char-misc tree.

I fixed it up (see below - though the additions probably want to be
moved as in the arm-soc commit) 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/misc/Kconfig
index b80cb6af0cb4,3209ee020b15..000000000000
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -496,6 -496,30 +496,14 @@@ config VEXPRESS_SYSCF
  	  bus. System Configuration interface is one of the possible means
  	  of generating transactions on this bus.
  
+ config ASPEED_P2A_CTRL
+ 	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
+ 	tristate "Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC bridge control"
+ 	help
+ 	  Control Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC mappings through
+ 	  ioctl()s, the driver also provides an interface for userspace mappings to
+ 	  a pre-defined region.
+ 
 -config ASPEED_LPC_CTRL
 -	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
 -	tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control"
 -	---help---
 -	  Control Aspeed ast2400/2500 HOST LPC to BMC mappings through
 -	  ioctl()s, the driver also provides a read/write interface to a BMC ram
 -	  region where the host LPC read/write region can be buffered.
 -
 -config ASPEED_LPC_SNOOP
 -	tristate "Aspeed ast2500 HOST LPC snoop support"
 -	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
 -	help
 -	  Provides a driver to control the LPC snoop interface which
 -	  allows the BMC to listen on and save the data written by
 -	  the host to an arbitrary LPC I/O port.
 -
  config PCI_ENDPOINT_TEST
  	depends on PCI
  	select CRC32
diff --cc drivers/misc/Makefile
index b9affcdaa3d6,c36239573a5c..000000000000
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -54,6 -54,9 +54,7 @@@ obj-$(CONFIG_GENWQE)		+= genwqe
  obj-$(CONFIG_ECHO)		+= echo/
  obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o
  obj-$(CONFIG_CXL_BASE)		+= cxl/
 -obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
 -obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o
+ obj-$(CONFIG_ASPEED_P2A_CTRL)	+= aspeed-p2a-ctrl.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
  obj-$(CONFIG_OCXL)		+= ocxl/
  obj-y				+= cardreader/

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

Re: linux-next: manual merge of the char-misc tree with the arm-soc tree

[Greg KH]

On Tue, Apr 30, 2019 at 05:40:51PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got conflicts in:
> 
>   drivers/misc/Kconfig
>   drivers/misc/Makefile
> 
> between commit:
> 
>   524feb799408 ("soc: add aspeed folder and misc drivers")
> 
> from the arm-soc tree and commit:
> 
>   01c60dcea9f7 ("drivers/misc: Add Aspeed P2A control driver")
> 
> from the char-misc tree.
> 
> I fixed it up (see below - though the additions probably want to be
> moved as in the arm-soc commit)

People are still arguing about this, so let's leave this as-is for now
:)

Thanks for the merge resolution,

greg k-h

Re: linux-next: manual merge of the char-misc tree with the arm-soc tree

[Stephen Rothwell]

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

Hi all,

On Tue, 30 Apr 2019 17:40:51 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the char-misc tree got conflicts in:
> 
>   drivers/misc/Kconfig
>   drivers/misc/Makefile
> 
> between commit:
> 
>   524feb799408 ("soc: add aspeed folder and misc drivers")
> 
> from the arm-soc tree and commit:
> 
>   01c60dcea9f7 ("drivers/misc: Add Aspeed P2A control driver")
> 
> from the char-misc tree.
> 
> I fixed it up (see below - though the additions probably want to be
> moved as in the arm-soc commit) 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/misc/Kconfig
> index b80cb6af0cb4,3209ee020b15..000000000000
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@@ -496,6 -496,30 +496,14 @@@ config VEXPRESS_SYSCF
>   	  bus. System Configuration interface is one of the possible means
>   	  of generating transactions on this bus.
>   
> + config ASPEED_P2A_CTRL
> + 	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
> + 	tristate "Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC bridge control"
> + 	help
> + 	  Control Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC mappings through
> + 	  ioctl()s, the driver also provides an interface for userspace mappings to
> + 	  a pre-defined region.
> + 
>  -config ASPEED_LPC_CTRL
>  -	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
>  -	tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control"
>  -	---help---
>  -	  Control Aspeed ast2400/2500 HOST LPC to BMC mappings through
>  -	  ioctl()s, the driver also provides a read/write interface to a BMC ram
>  -	  region where the host LPC read/write region can be buffered.
>  -
>  -config ASPEED_LPC_SNOOP
>  -	tristate "Aspeed ast2500 HOST LPC snoop support"
>  -	depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
>  -	help
>  -	  Provides a driver to control the LPC snoop interface which
>  -	  allows the BMC to listen on and save the data written by
>  -	  the host to an arbitrary LPC I/O port.
>  -
>   config PCI_ENDPOINT_TEST
>   	depends on PCI
>   	select CRC32
> diff --cc drivers/misc/Makefile
> index b9affcdaa3d6,c36239573a5c..000000000000
> --- a/drivers/misc/Makefile
> +++ b/drivers/misc/Makefile
> @@@ -54,6 -54,9 +54,7 @@@ obj-$(CONFIG_GENWQE)		+= genwqe
>   obj-$(CONFIG_ECHO)		+= echo/
>   obj-$(CONFIG_VEXPRESS_SYSCFG)	+= vexpress-syscfg.o
>   obj-$(CONFIG_CXL_BASE)		+= cxl/
>  -obj-$(CONFIG_ASPEED_LPC_CTRL)	+= aspeed-lpc-ctrl.o
>  -obj-$(CONFIG_ASPEED_LPC_SNOOP)	+= aspeed-lpc-snoop.o
> + obj-$(CONFIG_ASPEED_P2A_CTRL)	+= aspeed-p2a-ctrl.o
>   obj-$(CONFIG_PCI_ENDPOINT_TEST)	+= pci_endpoint_test.o
>   obj-$(CONFIG_OCXL)		+= ocxl/
>   obj-y				+= cardreader/

This is now a conflict between the arm-soc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the char-misc tree with the arm-soc tree

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt

between commit:

  c04421c68fd4 ("dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible")

from the arm-soc tree and commit:

  e7393b60a14f ("dt-bindings: phy: convert Qualcomm USB HS phy to yaml")

from the char-misc tree.

I fixed it up (I removed the file and added the following patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Mar 2022 16:48:51 +1100
Subject: [PATCH] fixup for "dt-bindings: phy: convert Qualcomm USB HS phy to yaml"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
index a60386bd19b2..e23e5590eaa3 100644
--- a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
@@ -38,6 +38,7 @@ properties:
     items:
       - enum:
           - qcom,usb-hs-phy-apq8064
+          - qcom,usb-hs-phy-msm8226
           - qcom,usb-hs-phy-msm8916
           - qcom,usb-hs-phy-msm8974
       - const: qcom,usb-hs-phy
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: manual merge of the char-misc tree with the arm-soc tree

[Greg KH]

On Tue, Mar 15, 2022 at 04:51:33PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt
> 
> between commit:
> 
>   c04421c68fd4 ("dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible")
> 
> from the arm-soc tree and commit:
> 
>   e7393b60a14f ("dt-bindings: phy: convert Qualcomm USB HS phy to yaml")
> 
> from the char-misc tree.
> 
> I fixed it up (I removed the file and added the following patch) 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.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Mar 2022 16:48:51 +1100
> Subject: [PATCH] fixup for "dt-bindings: phy: convert Qualcomm USB HS phy to yaml"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
> index a60386bd19b2..e23e5590eaa3 100644
> --- a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
> @@ -38,6 +38,7 @@ properties:
>      items:
>        - enum:
>            - qcom,usb-hs-phy-apq8064
> +          - qcom,usb-hs-phy-msm8226
>            - qcom,usb-hs-phy-msm8916
>            - qcom,usb-hs-phy-msm8974
>        - const: qcom,usb-hs-phy
> -- 
> 2.34.1
> 
> -- 
> Cheers,
> Stephen Rothwell



Looks good, thanks!

linux-next: manual merge of the char-misc tree with the arm-soc tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
arch/arm/mach-omap2/Kconfig between commit 9e1e632c4846 ("ARM: OMAP2+:
Drop board file for ti8168evm") from the arm-soc tree and commit
184901a06a36 ("ARM: removing support for etb/etm in
"arch/arm/kernel/"") from the char-misc 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 arch/arm/mach-omap2/Kconfig
index 27ec8923ddf6,06020fe77e57..000000000000
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -276,14 -282,16 +276,6 @@@ config MACH_SBC353
  	default y
  	select OMAP_PACKAGE_CUS
  
- config OMAP3_EMU
- 	bool "OMAP3 debugging peripherals"
- 	depends on ARCH_OMAP3
- 	select ARM_AMBA
- 	select OC_ETM
- 	help
- 	  Say Y here to enable debugging hardware of omap3
 -config MACH_TI8168EVM
 -	bool "TI8168 Evaluation Module"
 -	depends on SOC_TI81XX
 -	default y
 -
 -config MACH_TI8148EVM
 -	bool "TI8148 Evaluation Module"
 -	depends on SOC_TI81XX
 -	default y
--
  config OMAP3_SDRC_AC_TIMING
  	bool "Enable SDRC AC timing register changes"
  	depends on ARCH_OMAP3

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

Re: linux-next: manual merge of the char-misc tree with the arm-soc tree

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [141120 22:26]:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> arch/arm/mach-omap2/Kconfig between commit 9e1e632c4846 ("ARM: OMAP2+:
> Drop board file for ti8168evm") from the arm-soc tree and commit
> 184901a06a36 ("ARM: removing support for etb/etm in
> "arch/arm/kernel/"") from the char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks right to me thanks.

Tony 
 
> diff --cc arch/arm/mach-omap2/Kconfig
> index 27ec8923ddf6,06020fe77e57..000000000000
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@@ -276,14 -282,16 +276,6 @@@ config MACH_SBC353
>   	default y
>   	select OMAP_PACKAGE_CUS
>   
> - config OMAP3_EMU
> - 	bool "OMAP3 debugging peripherals"
> - 	depends on ARCH_OMAP3
> - 	select ARM_AMBA
> - 	select OC_ETM
> - 	help
> - 	  Say Y here to enable debugging hardware of omap3
>  -config MACH_TI8168EVM
>  -	bool "TI8168 Evaluation Module"
>  -	depends on SOC_TI81XX
>  -	default y
>  -
>  -config MACH_TI8148EVM
>  -	bool "TI8148 Evaluation Module"
>  -	depends on SOC_TI81XX
>  -	default y
> --
>   config OMAP3_SDRC_AC_TIMING
>   	bool "Enable SDRC AC timing register changes"
>   	depends on ARCH_OMAP3