linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the char-misc tree with the qcom tree
@ 2024-06-17 19:52 Mark Brown
  2024-06-18  6:38 ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2024-06-17 19:52 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann
  Cc: Bjorn Andersson, Gustavo Silva, Linux Kernel Mailing List,
	Linux Next Mailing List, Sumit Garg

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

Hi all,

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

  Documentation/devicetree/bindings/vendor-prefixes.yaml

between commit:

  1fabbb0888c3d ("dt-bindings: vendor-prefixes: Add Schneider Electric")

from the qcom tree and commit:

  202ce3eaa6912 ("dt-bindings: vendor-prefixes: add ScioSense")

from the char-misc 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.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 56ad56d7733e9,044e2001f4e3a..0000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1264,8 -1254,8 +1264,10 @@@ patternProperties
      description: Smart Battery System
    "^schindler,.*":
      description: Schindler
 +  "^schneider,.*":
 +    description: Schneider Electric
+   "^sciosense,.*":
+     description: ScioSense B.V.
    "^seagate,.*":
      description: Seagate Technology PLC
    "^seeed,.*":

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: linux-next: manual merge of the char-misc tree with the qcom tree
  2024-06-17 19:52 linux-next: manual merge of the char-misc tree with the qcom tree Mark Brown
@ 2024-06-18  6:38 ` Greg KH
  0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2024-06-18  6:38 UTC (permalink / raw)
  To: Mark Brown
  Cc: Arnd Bergmann, Bjorn Andersson, Gustavo Silva,
	Linux Kernel Mailing List, Linux Next Mailing List, Sumit Garg

On Mon, Jun 17, 2024 at 08:52:45PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   Documentation/devicetree/bindings/vendor-prefixes.yaml
> 
> between commit:
> 
>   1fabbb0888c3d ("dt-bindings: vendor-prefixes: Add Schneider Electric")
> 
> from the qcom tree and commit:
> 
>   202ce3eaa6912 ("dt-bindings: vendor-prefixes: add ScioSense")
> 
> from the char-misc 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.
> 
> diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 56ad56d7733e9,044e2001f4e3a..0000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@@ -1264,8 -1254,8 +1264,10 @@@ patternProperties
>       description: Smart Battery System
>     "^schindler,.*":
>       description: Schindler
>  +  "^schneider,.*":
>  +    description: Schneider Electric
> +   "^sciosense,.*":
> +     description: ScioSense B.V.
>     "^seagate,.*":
>       description: Seagate Technology PLC
>     "^seeed,.*":

Looks good, thanks!

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: linux-next: manual merge of the char-misc tree with the qcom tree
  2019-01-29 20:30   ` Andy Gross
@ 2019-01-29 21:07     ` Greg KH
  0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2019-01-29 21:07 UTC (permalink / raw)
  To: Andy Gross
  Cc: Georgi Djakov, Stephen Rothwell, Arnd Bergmann,
	Linux Next Mailing List, Linux Kernel Mailing List, David Dai,
	Taniya Das, Rajendra Nayak

On Tue, Jan 29, 2019 at 02:30:08PM -0600, Andy Gross wrote:
> On Tue, 29 Jan 2019 at 05:46, Georgi Djakov <georgi.djakov@linaro.org> wrote:
> >
> > Hi Stephen,
> >
> > On 1/29/19 05:08, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the char-misc tree got a conflict in:
> > >
> > >   arch/arm64/boot/dts/qcom/sdm845.dtsi
> > >
> > > between commits:
> > >
> > >   05556681948b ("arm64: dts: sdm845: Add videocc node")
> > >   5b6f186f0abb ("arm64: dts: sdm845: Add rpmh powercontroller node")
> > >
> > > from the qcom tree and commit:
> > >
> > >   ae0037dbfc5e ("arm64: dts: sdm845: Add interconnect provider DT nodes")
> > >
> > > from the char-misc 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.
> 
> Greg,
> I'd prefer in this instance that this patch get dropped from
> char-misc.  I have too much stuff in flight with some additional
> patches coming in to mess with this right now.  And we don't have
> clients rdy anyway for this so let's wait till next cycle on this one.

Now reverted.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: linux-next: manual merge of the char-misc tree with the qcom tree
  2019-01-29 11:46 ` Georgi Djakov
@ 2019-01-29 20:30   ` Andy Gross
  2019-01-29 21:07     ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Andy Gross @ 2019-01-29 20:30 UTC (permalink / raw)
  To: Georgi Djakov
  Cc: Stephen Rothwell, Greg KH, Arnd Bergmann,
	Linux Next Mailing List, Linux Kernel Mailing List, David Dai,
	Taniya Das, Rajendra Nayak

On Tue, 29 Jan 2019 at 05:46, Georgi Djakov <georgi.djakov@linaro.org> wrote:
>
> Hi Stephen,
>
> On 1/29/19 05:08, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> >   arch/arm64/boot/dts/qcom/sdm845.dtsi
> >
> > between commits:
> >
> >   05556681948b ("arm64: dts: sdm845: Add videocc node")
> >   5b6f186f0abb ("arm64: dts: sdm845: Add rpmh powercontroller node")
> >
> > from the qcom tree and commit:
> >
> >   ae0037dbfc5e ("arm64: dts: sdm845: Add interconnect provider DT nodes")
> >
> > from the char-misc 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.

Greg,
I'd prefer in this instance that this patch get dropped from
char-misc.  I have too much stuff in flight with some additional
patches coming in to mess with this right now.  And we don't have
clients rdy anyway for this so let's wait till next cycle on this one.

Andy

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: linux-next: manual merge of the char-misc tree with the qcom tree
  2019-01-29  3:08 Stephen Rothwell
@ 2019-01-29 11:46 ` Georgi Djakov
  2019-01-29 20:30   ` Andy Gross
  0 siblings, 1 reply; 6+ messages in thread
From: Georgi Djakov @ 2019-01-29 11:46 UTC (permalink / raw)
  To: Stephen Rothwell, Greg KH, Arnd Bergmann, Andy Gross
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, David Dai,
	Taniya Das, Rajendra Nayak

Hi Stephen,

On 1/29/19 05:08, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/sdm845.dtsi
> 
> between commits:
> 
>   05556681948b ("arm64: dts: sdm845: Add videocc node")
>   5b6f186f0abb ("arm64: dts: sdm845: Add rpmh powercontroller node")
> 
> from the qcom tree and commit:
> 
>   ae0037dbfc5e ("arm64: dts: sdm845: Add interconnect provider DT nodes")
> 
> from the char-misc 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.

Thanks for the fix! I have checked the tree and the merge is correct.

BR,
Georgi

^ permalink raw reply	[flat|nested] 6+ messages in thread

* linux-next: manual merge of the char-misc tree with the qcom tree
@ 2019-01-29  3:08 Stephen Rothwell
  2019-01-29 11:46 ` Georgi Djakov
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2019-01-29  3:08 UTC (permalink / raw)
  To: Greg KH, Arnd Bergmann, Andy Gross
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, David Dai,
	Taniya Das, Rajendra Nayak

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

Hi all,

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

  arch/arm64/boot/dts/qcom/sdm845.dtsi

between commits:

  05556681948b ("arm64: dts: sdm845: Add videocc node")
  5b6f186f0abb ("arm64: dts: sdm845: Add rpmh powercontroller node")

from the qcom tree and commit:

  ae0037dbfc5e ("arm64: dts: sdm845: Add interconnect provider DT nodes")

from the char-misc 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/boot/dts/qcom/sdm845.dtsi
index 0ec827394e92,5179cb94c95b..000000000000
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@@ -7,16 -7,13 +7,17 @@@
  
  #include <dt-bindings/clock/qcom,dispcc-sdm845.h>
  #include <dt-bindings/clock/qcom,gcc-sdm845.h>
 +#include <dt-bindings/clock/qcom,gpucc-sdm845.h>
 +#include <dt-bindings/clock/qcom,lpass-sdm845.h>
  #include <dt-bindings/clock/qcom,rpmh.h>
 +#include <dt-bindings/clock/qcom,videocc-sdm845.h>
+ #include <dt-bindings/interconnect/qcom,sdm845.h>
  #include <dt-bindings/interrupt-controller/arm-gic.h>
  #include <dt-bindings/phy/phy-qcom-qusb2.h>
 +#include <dt-bindings/power/qcom-rpmpd.h>
  #include <dt-bindings/reset/qcom,sdm845-aoss.h>
 +#include <dt-bindings/reset/qcom,sdm845-pdc.h>
  #include <dt-bindings/soc/qcom,rpmh-rsc.h>
 -#include <dt-bindings/clock/qcom,gcc-sdm845.h>
  
  / {
  	interrupt-parent = <&intc>;
@@@ -2075,55 -1604,10 +2076,60 @@@
  				#clock-cells = <1>;
  			};
  
 +			rpmhpd: power-controller {
 +				compatible = "qcom,sdm845-rpmhpd";
 +				#power-domain-cells = <1>;
 +				operating-points-v2 = <&rpmhpd_opp_table>;
 +
 +				rpmhpd_opp_table: opp-table {
 +					compatible = "operating-points-v2";
 +
 +					rpmhpd_opp_ret: opp1 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_RETENTION>;
 +					};
 +
 +					rpmhpd_opp_min_svs: opp2 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
 +					};
 +
 +					rpmhpd_opp_low_svs: opp3 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
 +					};
 +
 +					rpmhpd_opp_svs: opp4 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
 +					};
 +
 +					rpmhpd_opp_svs_l1: opp5 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
 +					};
 +
 +					rpmhpd_opp_nom: opp6 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_NOM>;
 +					};
 +
 +					rpmhpd_opp_nom_l1: opp7 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
 +					};
 +
 +					rpmhpd_opp_nom_l2: opp8 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_NOM_L2>;
 +					};
 +
 +					rpmhpd_opp_turbo: opp9 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_TURBO>;
 +					};
 +
 +					rpmhpd_opp_turbo_l1: opp10 {
 +						opp-level = <RPMH_REGULATOR_LEVEL_TURBO_L1>;
 +					};
 +				};
 +			};
++
+ 			rsc_hlos: interconnect {
+ 				compatible = "qcom,sdm845-rsc-hlos";
+ 				#interconnect-cells = <1>;
+ 			};
  		};
  
  		intc: interrupt-controller@17a00000 {

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-06-18  6:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-17 19:52 linux-next: manual merge of the char-misc tree with the qcom tree Mark Brown
2024-06-18  6:38 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2019-01-29  3:08 Stephen Rothwell
2019-01-29 11:46 ` Georgi Djakov
2019-01-29 20:30   ` Andy Gross
2019-01-29 21:07     ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).