* linux-next: manual merge of the phy-next tree with the samsung-krzk tree
@ 2024-07-03 4:19 Stephen Rothwell
2024-07-23 23:14 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-07-03 4:19 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Vinod Koul, Krzysztof Kozlowski
Cc: André Draszik, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List, Peter Griffin
[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
include/linux/soc/samsung/exynos-regs-pmu.h
between commit:
85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
from the samsung-krzk tree and commit:
32267c29bc7d ("phy: exynos5-usbdrd: support Exynos USBDRD 3.1 combo phy (HS & SS)")
from the phy-next 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 include/linux/soc/samsung/exynos-regs-pmu.h
index f411c176536d,6765160eaab2..000000000000
--- a/include/linux/soc/samsung/exynos-regs-pmu.h
+++ b/include/linux/soc/samsung/exynos-regs-pmu.h
@@@ -657,8 -657,8 +657,12 @@@
#define EXYNOS5433_PAD_RETENTION_UFS_OPTION (0x3268)
#define EXYNOS5433_PAD_RETENTION_FSYSGENIO_OPTION (0x32A8)
+/* For Tensor GS101 */
+#define GS101_SYSIP_DAT0 (0x810)
+#define GS101_SYSTEM_CONFIGURATION (0x3A00)
+
+ /* For GS101 */
+ #define GS101_PHY_CTRL_USB20 0x3eb0
+ #define GS101_PHY_CTRL_USBDP 0x3eb4
+
#endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */
[-- 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 phy-next tree with the samsung-krzk tree
2024-07-03 4:19 linux-next: manual merge of the phy-next tree with the samsung-krzk tree Stephen Rothwell
@ 2024-07-23 23:14 ` Stephen Rothwell
2024-07-24 8:57 ` André Draszik
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-07-23 23:14 UTC (permalink / raw)
To: Kishon Vijay Abraham I, Vinod Koul
Cc: Krzysztof Kozlowski, André Draszik, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List, Peter Griffin
[-- Attachment #1: Type: text/plain, Size: 1676 bytes --]
Hi all,
On Wed, 3 Jul 2024 14:19:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the phy-next tree got a conflict in:
>
> include/linux/soc/samsung/exynos-regs-pmu.h
>
> between commit:
>
> 85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
>
> from the samsung-krzk tree and commit:
>
> 32267c29bc7d ("phy: exynos5-usbdrd: support Exynos USBDRD 3.1 combo phy (HS & SS)")
>
> from the phy-next 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 include/linux/soc/samsung/exynos-regs-pmu.h
> index f411c176536d,6765160eaab2..000000000000
> --- a/include/linux/soc/samsung/exynos-regs-pmu.h
> +++ b/include/linux/soc/samsung/exynos-regs-pmu.h
> @@@ -657,8 -657,8 +657,12 @@@
> #define EXYNOS5433_PAD_RETENTION_UFS_OPTION (0x3268)
> #define EXYNOS5433_PAD_RETENTION_FSYSGENIO_OPTION (0x32A8)
>
> +/* For Tensor GS101 */
> +#define GS101_SYSIP_DAT0 (0x810)
> +#define GS101_SYSTEM_CONFIGURATION (0x3A00)
> +
> + /* For GS101 */
> + #define GS101_PHY_CTRL_USB20 0x3eb0
> + #define GS101_PHY_CTRL_USBDP 0x3eb4
> +
> #endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */
This is now a conflict between he phy-next tree and Linus' 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 phy-next tree with the samsung-krzk tree
2024-07-23 23:14 ` Stephen Rothwell
@ 2024-07-24 8:57 ` André Draszik
2024-07-24 9:00 ` Vinod Koul
0 siblings, 1 reply; 4+ messages in thread
From: André Draszik @ 2024-07-24 8:57 UTC (permalink / raw)
To: Stephen Rothwell, Kishon Vijay Abraham I, Vinod Koul
Cc: Krzysztof Kozlowski, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List, Peter Griffin
Hi Stephen,
On Wed, 2024-07-24 at 09:14 +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Wed, 3 Jul 2024 14:19:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the phy-next tree got a conflict in:
> >
> > include/linux/soc/samsung/exynos-regs-pmu.h
> >
> > between commit:
> >
> > 85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
> >
> > from the samsung-krzk tree and commit:
> >
> > 32267c29bc7d ("phy: exynos5-usbdrd: support Exynos USBDRD 3.1 combo phy (HS & SS)")
> >
> > from the phy-next 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 include/linux/soc/samsung/exynos-regs-pmu.h
> > index f411c176536d,6765160eaab2..000000000000
> > --- a/include/linux/soc/samsung/exynos-regs-pmu.h
> > +++ b/include/linux/soc/samsung/exynos-regs-pmu.h
> > @@@ -657,8 -657,8 +657,12 @@@
> > #define EXYNOS5433_PAD_RETENTION_UFS_OPTION (0x3268)
> > #define EXYNOS5433_PAD_RETENTION_FSYSGENIO_OPTION (0x32A8)
> >
> > +/* For Tensor GS101 */
> > +#define GS101_SYSIP_DAT0 (0x810)
> > +#define GS101_SYSTEM_CONFIGURATION (0x3A00)
> > +
> > + /* For GS101 */
> > + #define GS101_PHY_CTRL_USB20 0x3eb0
> > + #define GS101_PHY_CTRL_USBDP 0x3eb4
> > +
> > #endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */
>
> This is now a conflict between he phy-next tree and Linus' tree.
What's the way to resolve this? Can I do something?
Cheers,
Andre'
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the phy-next tree with the samsung-krzk tree
2024-07-24 8:57 ` André Draszik
@ 2024-07-24 9:00 ` Vinod Koul
0 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2024-07-24 9:00 UTC (permalink / raw)
To: André Draszik
Cc: Stephen Rothwell, Kishon Vijay Abraham I, Krzysztof Kozlowski,
Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List, Peter Griffin
On 24-07-24, 09:57, André Draszik wrote:
> Hi Stephen,
>
> On Wed, 2024-07-24 at 09:14 +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Wed, 3 Jul 2024 14:19:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the phy-next tree got a conflict in:
> > >
> > > include/linux/soc/samsung/exynos-regs-pmu.h
> > >
> > > between commit:
> > >
> > > 85863cee8ce0 ("soc: samsung: exynos-pmu: add support for PMU_ALIVE non atomic registers")
> > >
> > > from the samsung-krzk tree and commit:
> > >
> > > 32267c29bc7d ("phy: exynos5-usbdrd: support Exynos USBDRD 3.1 combo phy (HS & SS)")
> > >
> > > from the phy-next 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 include/linux/soc/samsung/exynos-regs-pmu.h
> > > index f411c176536d,6765160eaab2..000000000000
> > > --- a/include/linux/soc/samsung/exynos-regs-pmu.h
> > > +++ b/include/linux/soc/samsung/exynos-regs-pmu.h
> > > @@@ -657,8 -657,8 +657,12 @@@
> > > #define EXYNOS5433_PAD_RETENTION_UFS_OPTION (0x3268)
> > > #define EXYNOS5433_PAD_RETENTION_FSYSGENIO_OPTION (0x32A8)
> > >
> > > +/* For Tensor GS101 */
> > > +#define GS101_SYSIP_DAT0 (0x810)
> > > +#define GS101_SYSTEM_CONFIGURATION (0x3A00)
> > > +
> > > + /* For GS101 */
> > > + #define GS101_PHY_CTRL_USB20 0x3eb0
> > > + #define GS101_PHY_CTRL_USBDP 0x3eb4
> > > +
> > > #endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */
> >
> > This is now a conflict between he phy-next tree and Linus' tree.
>
> What's the way to resolve this? Can I do something?
Not much to do, conflicts are expected and Linus will resolve it when he
pulls phy tree
BR
>
> Cheers,
> Andre'
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-24 9:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-03 4:19 linux-next: manual merge of the phy-next tree with the samsung-krzk tree Stephen Rothwell
2024-07-23 23:14 ` Stephen Rothwell
2024-07-24 8:57 ` André Draszik
2024-07-24 9:00 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox