Re: [linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] misc: Kconfig: drop the merge conflicted hunk
In message: [linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH]
misc: Kconfig: drop the merge conflicted hunk
on 27/09/2023 quanyang.w...@windriver.com wrote:
> From: Quanyang Wang
>
> The kernel option OPEN_DICE has been removed in commit 9989598547560
> ("drivers: misc: Add Support for TMR Manager"). Remove it to fix the
> merge conflicted hunk.
>
> Signed-off-by: Quanyang Wang
> ---
> Hi Bruce,
> Would you please help merge this patch to the branch:
> v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
merged.
Bruce
> Thanks,
> Quanyang
> ---
> drivers/misc/Kconfig | 7 ---
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
> index f60366ef4dafe..c1b1b57223776 100644
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -499,16 +499,9 @@ config HISI_HIKEY_USB
> switching between the dual-role USB-C port and the USB-A host ports
> using only one USB controller.
>
> -<<<<<<< HEAD
> config TMR_MANAGER
> bool "Select TMR Manager"
> depends on MICROBLAZE && MB_MANAGER
> -===
> -config OPEN_DICE
> - tristate "Open Profile for DICE driver"
> - depends on OF_RESERVED_MEM
> - depends on HAS_IOMEM
> ->>>>>>> v6.1/standard/base
> help
> This option enables the driver developed for TMR Manager. The Triple
> Modular Redundancy(TMR) manager provides support for fault detection
> --
> 2.36.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13137):
https://lists.yoctoproject.org/g/linux-yocto/message/13137
Mute This Topic: https://lists.yoctoproject.org/mt/101615596/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] misc: Kconfig: drop the merge conflicted hunk
This is the second chunk that my sanity script missed. Something is clearly
wrong.
Thanks for the fix, I was going to complete my release activities on the
stable kernel's today and this saves me time.
Bruce
On Wed, Sep 27, 2023 at 8:01 AM wrote:
> From: Quanyang Wang
>
> The kernel option OPEN_DICE has been removed in commit 9989598547560
> ("drivers: misc: Add Support for TMR Manager"). Remove it to fix the
> merge conflicted hunk.
>
> Signed-off-by: Quanyang Wang
> ---
> Hi Bruce,
> Would you please help merge this patch to the branch:
> v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
> Thanks,
> Quanyang
> ---
> drivers/misc/Kconfig | 7 ---
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
> index f60366ef4dafe..c1b1b57223776 100644
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -499,16 +499,9 @@ config HISI_HIKEY_USB
> switching between the dual-role USB-C port and the USB-A host
> ports
> using only one USB controller.
>
> -<<< HEAD
> config TMR_MANAGER
> bool "Select TMR Manager"
> depends on MICROBLAZE && MB_MANAGER
> -===
> -config OPEN_DICE
> - tristate "Open Profile for DICE driver"
> - depends on OF_RESERVED_MEM
> - depends on HAS_IOMEM
> ->>> v6.1/standard/base
> help
> This option enables the driver developed for TMR Manager. The
> Triple
> Modular Redundancy(TMR) manager provides support for fault
> detection
> --
> 2.36.1
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13133):
https://lists.yoctoproject.org/g/linux-yocto/message/13133
Mute This Topic: https://lists.yoctoproject.org/mt/101615596/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] misc: Kconfig: drop the merge conflicted hunk
From: Quanyang Wang
The kernel option OPEN_DICE has been removed in commit 9989598547560
("drivers: misc: Add Support for TMR Manager"). Remove it to fix the
merge conflicted hunk.
Signed-off-by: Quanyang Wang
---
Hi Bruce,
Would you please help merge this patch to the branch:
v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
Thanks,
Quanyang
---
drivers/misc/Kconfig | 7 ---
1 file changed, 7 deletions(-)
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f60366ef4dafe..c1b1b57223776 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -499,16 +499,9 @@ config HISI_HIKEY_USB
switching between the dual-role USB-C port and the USB-A host ports
using only one USB controller.
-<<< HEAD
config TMR_MANAGER
bool "Select TMR Manager"
depends on MICROBLAZE && MB_MANAGER
-===
-config OPEN_DICE
- tristate "Open Profile for DICE driver"
- depends on OF_RESERVED_MEM
- depends on HAS_IOMEM
->>> v6.1/standard/base
help
This option enables the driver developed for TMR Manager. The Triple
Modular Redundancy(TMR) manager provides support for fault detection
--
2.36.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13132):
https://lists.yoctoproject.org/g/linux-yocto/message/13132
Mute This Topic: https://lists.yoctoproject.org/mt/101615596/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
