[linux-yocto] jbd2: Drop the merge conflicted hunk
From: Kevin Hao
And the transaction->t_handle_lock is also not needed in the new
codes.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the v5.15/standard/base branch.
fs/jbd2/transaction.c | 21 -
1 file changed, 21 deletions(-)
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 0ec4d6346653..c2125203ef2d 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -853,15 +853,12 @@ void jbd2_journal_wait_updates(journal_t *journal)
if (!transaction)
break;
- spin_lock(&transaction->t_handle_lock);
prepare_to_wait(&journal->j_wait_updates, &wait,
TASK_UNINTERRUPTIBLE);
if (!atomic_read(&transaction->t_updates)) {
- spin_unlock(&transaction->t_handle_lock);
finish_wait(&journal->j_wait_updates, &wait);
break;
}
- spin_unlock(&transaction->t_handle_lock);
write_unlock(&journal->j_state_lock);
schedule();
finish_wait(&journal->j_wait_updates, &wait);
@@ -897,24 +894,6 @@ void jbd2_journal_lock_updates(journal_t *journal)
/* Wait until there are no running t_updates */
jbd2_journal_wait_updates(journal);
-===
- jbd2_might_wait_for_commit(journal);
-
- write_lock(&journal->j_state_lock);
- ++journal->j_barrier_count;
-
- /* Wait until there are no reserved handles */
- if (atomic_read(&journal->j_reserved_credits)) {
- write_unlock(&journal->j_state_lock);
- wait_event(journal->j_wait_reserved,
- atomic_read(&journal->j_reserved_credits) == 0);
- write_lock(&journal->j_state_lock);
- }
-
- /* Wait until there are no running t_updates */
- jbd2_journal_wait_updates(journal);
-
->>> v5.15.133
write_unlock(&journal->j_state_lock);
/*
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13126):
https://lists.yoctoproject.org/g/linux-yocto/message/13126
Mute This Topic: https://lists.yoctoproject.org/mt/101613894/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init()
From: Kevin Hao
These were added mistakenly when fixing the merge conflicts.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/cn-sdkv5.15/octeon
v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
include/linux/arm_sdei.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h
index 255701e1251b..a5bb250d7306 100644
--- a/include/linux/arm_sdei.h
+++ b/include/linux/arm_sdei.h
@@ -46,12 +46,10 @@ int sdei_unregister_ghes(struct ghes *ghes);
/* For use by arch code when CPU hotplug notifiers are not appropriate. */
int sdei_mask_local_cpu(void);
int sdei_unmask_local_cpu(void);
-void __init sdei_init(void);
void sdei_handler_abort(void);
#else
static inline int sdei_mask_local_cpu(void) { return 0; }
static inline int sdei_unmask_local_cpu(void) { return 0; }
-static inline void sdei_init(void) { }
static inline void sdei_handler_abort(void) { }
#endif /* CONFIG_ARM_SDE_INTERFACE */
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13127):
https://lists.yoctoproject.org/g/linux-yocto/message/13127
Mute This Topic: https://lists.yoctoproject.org/mt/101614739/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init()
On Wed, Sep 27, 2023 at 06:53:44PM +0800, Kevin Hao wrote:
> From: Kevin Hao
>
> These were added mistakenly when fixing the merge conflicts.
>
> Signed-off-by: Kevin Hao
> ---
> Hi Bruce,
>
> Please help me merge this into the following two branches:
> v5.15/standard/cn-sdkv5.15/octeon
> v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
Sorry, two typos. The branches should be:
v5.15/standard/cn-sdkv5.4/octeon
v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
Thanks,
Kevin
>
> include/linux/arm_sdei.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h
> index 255701e1251b..a5bb250d7306 100644
> --- a/include/linux/arm_sdei.h
> +++ b/include/linux/arm_sdei.h
> @@ -46,12 +46,10 @@ int sdei_unregister_ghes(struct ghes *ghes);
> /* For use by arch code when CPU hotplug notifiers are not appropriate. */
> int sdei_mask_local_cpu(void);
> int sdei_unmask_local_cpu(void);
> -void __init sdei_init(void);
> void sdei_handler_abort(void);
> #else
> static inline int sdei_mask_local_cpu(void) { return 0; }
> static inline int sdei_unmask_local_cpu(void) { return 0; }
> -static inline void sdei_init(void) { }
> static inline void sdei_handler_abort(void) { }
> #endif /* CONFIG_ARM_SDE_INTERFACE */
>
> --
> 2.39.2
>
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13128):
https://lists.yoctoproject.org/g/linux-yocto/message/13128
Mute This Topic: https://lists.yoctoproject.org/mt/101614739/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] net: hsr: Reapply the change for fill_frame_info()
From: Kevin Hao
The change introduced by commit 6a4480c5e6eb ("hsr: Fix uninit-value
access in fill_frame_info()") were lost when fixing the merge
conflicts. Restore it back.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/ti-sdk-5.10/ti-j72xx
v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
net/hsr/hsr_forward.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index 70c9ac89ca61..09ee979e9c9e 100644
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -776,6 +776,7 @@ static int fill_frame_info(struct hsr_frame_info *frame,
if (frame->is_vlan) {
vlan_hdr = (struct hsr_vlan_ethhdr *)ethhdr;
proto = vlan_hdr->vlanhdr.h_vlan_encapsulated_proto;
+ return -EINVAL;
}
frame->is_from_san = false;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13129):
https://lists.yoctoproject.org/g/linux-yocto/message/13129
Mute This Topic: https://lists.yoctoproject.org/mt/101615037/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] pci: dwc: pci-imx6: Set the deinit callback to imx6_pcie_host_deinit()
From: Kevin Hao
This is the deinit callback introduced by the SDK version, so we should
use this instead of imx6_pcie_host_deinit().
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/nxp-sdk-6.1/nxp-soc
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
drivers/pci/controller/dwc/pci-imx6.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/controller/dwc/pci-imx6.c
b/drivers/pci/controller/dwc/pci-imx6.c
index b92e90641ee4..afa37d036b78 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1225,7 +1225,7 @@ static void imx6_pcie_host_deinit(struct dw_pcie_rp *pp)
static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
.host_init = imx6_pcie_host_init,
- .host_deinit = imx6_pcie_host_exit,
+ .host_deinit = imx6_pcie_host_deinit,
};
static const struct dw_pcie_ops dw_pcie_ops = {
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13130):
https://lists.yoctoproject.org/g/linux-yocto/message/13130
Mute This Topic: https://lists.yoctoproject.org/mt/101615247/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] jbd2: Drop the merge conflicted hunk
Hmm. This should have been picked up by my sanity scripts. I'll have to
figure out what went wrong.
Bruce
On Wed, Sep 27, 2023 at 5:02 AM Kevin Hao wrote:
> From: Kevin Hao
>
> And the transaction->t_handle_lock is also not needed in the new
> codes.
>
> Signed-off-by: Kevin Hao
> ---
> Hi Bruce,
>
> Please help me merge this into the v5.15/standard/base branch.
>
> fs/jbd2/transaction.c | 21 -
> 1 file changed, 21 deletions(-)
>
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index 0ec4d6346653..c2125203ef2d 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -853,15 +853,12 @@ void jbd2_journal_wait_updates(journal_t *journal)
> if (!transaction)
> break;
>
> - spin_lock(&transaction->t_handle_lock);
> prepare_to_wait(&journal->j_wait_updates, &wait,
> TASK_UNINTERRUPTIBLE);
> if (!atomic_read(&transaction->t_updates)) {
> - spin_unlock(&transaction->t_handle_lock);
> finish_wait(&journal->j_wait_updates, &wait);
> break;
> }
> - spin_unlock(&transaction->t_handle_lock);
> write_unlock(&journal->j_state_lock);
> schedule();
> finish_wait(&journal->j_wait_updates, &wait);
> @@ -897,24 +894,6 @@ void jbd2_journal_lock_updates(journal_t *journal)
> /* Wait until there are no running t_updates */
> jbd2_journal_wait_updates(journal);
>
> -===
> - jbd2_might_wait_for_commit(journal);
> -
> - write_lock(&journal->j_state_lock);
> - ++journal->j_barrier_count;
> -
> - /* Wait until there are no reserved handles */
> - if (atomic_read(&journal->j_reserved_credits)) {
> - write_unlock(&journal->j_state_lock);
> - wait_event(journal->j_wait_reserved,
> - atomic_read(&journal->j_reserved_credits) == 0);
> - write_lock(&journal->j_state_lock);
> - }
> -
> - /* Wait until there are no running t_updates */
> - jbd2_journal_wait_updates(journal);
> -
> ->>> v5.15.133
> write_unlock(&journal->j_state_lock);
>
> /*
> --
> 2.39.2
>
>
--
- 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 (#13131):
https://lists.yoctoproject.org/g/linux-yocto/message/13131
Mute This Topic: https://lists.yoctoproject.org/mt/101613894/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]
-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init()
In message: Re: [linux-yocto] arm_sdei: Drop the wrong declaration of
sdei_init()
on 27/09/2023 Kevin Hao wrote:
> On Wed, Sep 27, 2023 at 06:53:44PM +0800, Kevin Hao wrote:
> > From: Kevin Hao
> >
> > These were added mistakenly when fixing the merge conflicts.
> >
> > Signed-off-by: Kevin Hao
> > ---
> > Hi Bruce,
> >
> > Please help me merge this into the following two branches:
> > v5.15/standard/cn-sdkv5.15/octeon
> > v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
>
> Sorry, two typos. The branches should be:
> v5.15/standard/cn-sdkv5.4/octeon
> v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
merged.
Bruce
>
> Thanks,
> Kevin
>
> >
> > include/linux/arm_sdei.h | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h
> > index 255701e1251b..a5bb250d7306 100644
> > --- a/include/linux/arm_sdei.h
> > +++ b/include/linux/arm_sdei.h
> > @@ -46,12 +46,10 @@ int sdei_unregister_ghes(struct ghes *ghes);
> > /* For use by arch code when CPU hotplug notifiers are not appropriate. */
> > int sdei_mask_local_cpu(void);
> > int sdei_unmask_local_cpu(void);
> > -void __init sdei_init(void);
> > void sdei_handler_abort(void);
> > #else
> > static inline int sdei_mask_local_cpu(void) { return 0; }
> > static inline int sdei_unmask_local_cpu(void) { return 0; }
> > -static inline void sdei_init(void) { }
> > static inline void sdei_handler_abort(void) { }
> > #endif /* CONFIG_ARM_SDE_INTERFACE */
> >
> > --
> > 2.39.2
> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13134):
https://lists.yoctoproject.org/g/linux-yocto/message/13134
Mute This Topic: https://lists.yoctoproject.org/mt/101614739/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] net: hsr: Reapply the change for fill_frame_info()
In message: [linux-yocto] net: hsr: Reapply the change for fill_frame_info()
on 27/09/2023 Kevin Hao wrote:
> From: Kevin Hao
>
> The change introduced by commit 6a4480c5e6eb ("hsr: Fix uninit-value
> access in fill_frame_info()") were lost when fixing the merge
> conflicts. Restore it back.
>
> Signed-off-by: Kevin Hao
> ---
> Hi Bruce,
>
> Please help me merge this into the following two branches:
> v5.15/standard/ti-sdk-5.10/ti-j72xx
> v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
merged.
Bruce
>
> net/hsr/hsr_forward.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
> index 70c9ac89ca61..09ee979e9c9e 100644
> --- a/net/hsr/hsr_forward.c
> +++ b/net/hsr/hsr_forward.c
> @@ -776,6 +776,7 @@ static int fill_frame_info(struct hsr_frame_info *frame,
> if (frame->is_vlan) {
> vlan_hdr = (struct hsr_vlan_ethhdr *)ethhdr;
> proto = vlan_hdr->vlanhdr.h_vlan_encapsulated_proto;
> + return -EINVAL;
> }
>
> frame->is_from_san = false;
> --
> 2.39.2
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13135):
https://lists.yoctoproject.org/g/linux-yocto/message/13135
Mute This Topic: https://lists.yoctoproject.org/mt/101615037/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] pci: dwc: pci-imx6: Set the deinit callback to imx6_pcie_host_deinit()
In message: [linux-yocto] pci: dwc: pci-imx6: Set the deinit callback to
imx6_pcie_host_deinit()
on 27/09/2023 Kevin Hao wrote:
> From: Kevin Hao
>
> This is the deinit callback introduced by the SDK version, so we should
> use this instead of imx6_pcie_host_deinit().
>
> Signed-off-by: Kevin Hao
> ---
> Hi Bruce,
>
> Please help me merge this into the following two branches:
> v6.1/standard/nxp-sdk-6.1/nxp-soc
> v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
merged.
Bruce
>
> drivers/pci/controller/dwc/pci-imx6.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c
> b/drivers/pci/controller/dwc/pci-imx6.c
> index b92e90641ee4..afa37d036b78 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -1225,7 +1225,7 @@ static void imx6_pcie_host_deinit(struct dw_pcie_rp *pp)
>
> static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
> .host_init = imx6_pcie_host_init,
> - .host_deinit = imx6_pcie_host_exit,
> + .host_deinit = imx6_pcie_host_deinit,
> };
>
> static const struct dw_pcie_ops dw_pcie_ops = {
> --
> 2.39.2
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13136):
https://lists.yoctoproject.org/g/linux-yocto/message/13136
Mute This Topic: https://lists.yoctoproject.org/mt/101615247/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
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]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto][linux-yocto v6.1/standard/ti-sdk-6.1/ti-j7xxx] ti-j7xxx kernel part to upgrade to TI SDK ti-processor-sdk-linux-adas-j784s4-evm-09_00_01_02
Hi Bruce, Could you please help to merge below patches to kernel branch "v6.1/standard/ti-sdk-6.1/ti-j7xxx"? This is to upgrade BSP to TI SDK ti-processor-sdk-linux-adas-j784s4-evm-09_00_01_02. The following changes since commit 122d72613aea7d4f4673c70020eb9a0fc41c9e51: Merge branch 'v6.1/standard/base' into v6.1/standard/ti-sdk-6.1/ti-j7xxx (2023-09-25 23:35:42 -0400) are available in the Git repository at: https://github.com/xulinsun/ti-j72x v6.1/standard/ti-sdk-6.1/ti-j7xxx for you to fetch changes up to 9b435c21f564a42242874de2c11a065a6b3843f2: arm64: dts: ti: k3-j784s4: Add overlay for edge ai (2023-09-27 21:43:43 +0800) Achal Verma (5): PCI: j721e: Add support to build pci-j721e as a kernel module PCI: j721e: Fix missing prototypes warning dt-bindings: PCI: ti,j721e-pci-*: Add "ti,syscon-pcie-refclk-out" property pci: j721e: Enable reference clock output from serdes arm64: dts: ti: k3-j784s4-main: Enable refclock output from serdes. Alexander Stein (1): drm/bridge: ti-sn65dsi86: Allow GPIO operations to sleep Anand Gadiyar (1): arm64: dts: ti: k3-am62x-lp-sk: Disable PRU Andrew Davis (8): dt-bindings: clock: ehrpwm: Remove unneeded syscon compatible clk: keystone: syscon-clk: Allow the clock node to not be of type syscon arm64: dts: ti: k3-j721e-beagleboneai64: Fix mailbox node status arm64: dts: ti: k3-j721e: Remove PCIe endpoint nodes arm64: dts: ti: k3-j721e: Enable PCIe nodes at the board level arm64: dts: ti: k3-j721e: Enable MDIO nodes at the board level misc: dma-buf-phys: Add dependency on DMA-BUF dma-buf: heaps: Add dependency on OF_RESERVED_MEM on carveout heap Apurva Nandan (4): arm64: dts: ti: k3-j784s4-main: Switch MAIN R5F clusters to Split-mode arm64: dts: ti: k3-am62x-lp-sk: Update SPI NAND flash partitioning scheme arm64: dts: k3-j721s2: Add node for OSPI NAND Flash arm64: dts: ti: k3-am62a7-sk: Enable OSPI NAND Aradhya Bhatia (4): drm/bridge: sii902x: Add device_link dependency with drm device drm/bridge: sii902x: Add Power Management hooks HACK: drm/bridge: ite-it66121: Add drm_connector support drm/tidss: Set OLDI clock to bypass-25MHz during probe Arnd Bergmann (1): samples: pfsm: add CC_CAN_LINK dependency Aswath Govindraju (1): mmc: sdhci_am654: Disable data error interrupts while tuning Benjamin Bara (1): i2c: core: run atomic i2c xfer when !preemptible Bhavya Kapoor (8): arm64: dts: ti: k3-j784s4-mcu-wakeup: Add support for ADC nodes arm64: dts: ti: k3-j784s4-evm: Add pinmux information for ADC arm64: dts: ti: k3-j784s4-main: Enable support for high speed modes arm64: dts: ti: k3-j721s2-common-proc-board: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j784s4-evm: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j721e-common-proc-board: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j7200-common-proc-board: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j784s4-evm: Add support for MCAN interfaces Bin Liu (4): dt-bindings: serial: add binding documentation for TI PRUSS UART serial: 8250: add pruss uart driver arm: dts: am335x: add pruss uart controller node arm: dts: am335x-evmsk: use pruss uart on the Zigbee header Brandon Brnich (5): media: chips-media: wave5: Update firmware location arm64: dts: ti: k3-j721s2-main: Add sram-size for wave5 arm64: dts: ti: k3-j784s4-main: Add sram-size for wave5 dt-bindings: media: Update DT bindings for wave5 TEMP: media: img: vxe-vxd: decoder: Disable CMA for capture buffers Bryan Brattlof (7): arm64: dts: ti: k3-am64-main: add VTM node arm64: dts: ti: k3-am62-wakeup: add VTM node arm64: dts: ti: k3-am62a-wakeup: add VTM node thermal/drivers/k3_j72xx_bandgap: Simplify k3_thermal_get_temp() function dt-bindings: arm: ti: Add bindings for AM62P5 SoCs arm64: dts: ti: Introduce AM62P5 family of SoCs arm64: dts: ti: Add support for the AM62P5 Starter Kit Dan Carpenter (2): mfd: tps6594: Fix an error code in probe() net: ethernet: ti: am65-cpsw: Call of_node_put() on error path Darren Etheridge (5): media: img: vxe-vxd: enable GStreamer 1.20.5 media: platform: img: add missing mutex around function media: platform: img: vxd: fix the error handling media: platform: img: vxd add a sequencing mutex media: platform: img: vxe: finish adding profile/level and tool selection Dasnavis Sabiya (24): arm64: dts: ti: k3-am69-sk: Add eMMC mmc0 support arm64: dts: ti: k3-am69-sk: Enable mcu network port arm64: dts: ti: k3-am69-sk: Add Display and HDMI support arm64: dts: ti: k3-am69-sk: Add support fo
[linux-yocto][linux-yocto v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx] ti-j7xxx adds preempt-rt kernel patches to upgrade TI SDK 09_00_01_02
Hi Bruce, Could you please help to merge below patches to the preempt-rt kernel branch "v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx"? This is preempt-rt kernel to upgrade BSP to TI SDK ti-processor-sdk-linux-adas-j784s4-evm-09_00_01_02. The following changes since commit fef33486015f69a75b8bc5ab9e5efb57352ebef1: Merge branch 'v6.1/standard/preempt-rt/base' into v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx (2023-09-25 23:31:41 -0400) are available in the Git repository at: https://github.com/xulinsun/ti-j72x v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx for you to fetch changes up to cfd58dd795907fbd22465bd93960c2f3fe356462: arm64: dts: ti: k3-j784s4: Add overlay for edge ai (2023-09-27 21:41:28 +0800) Achal Verma (5): PCI: j721e: Add support to build pci-j721e as a kernel module PCI: j721e: Fix missing prototypes warning dt-bindings: PCI: ti,j721e-pci-*: Add "ti,syscon-pcie-refclk-out" property pci: j721e: Enable reference clock output from serdes arm64: dts: ti: k3-j784s4-main: Enable refclock output from serdes. Alexander Stein (1): drm/bridge: ti-sn65dsi86: Allow GPIO operations to sleep Anand Gadiyar (1): arm64: dts: ti: k3-am62x-lp-sk: Disable PRU Andrew Davis (8): dt-bindings: clock: ehrpwm: Remove unneeded syscon compatible clk: keystone: syscon-clk: Allow the clock node to not be of type syscon arm64: dts: ti: k3-j721e-beagleboneai64: Fix mailbox node status arm64: dts: ti: k3-j721e: Remove PCIe endpoint nodes arm64: dts: ti: k3-j721e: Enable PCIe nodes at the board level arm64: dts: ti: k3-j721e: Enable MDIO nodes at the board level misc: dma-buf-phys: Add dependency on DMA-BUF dma-buf: heaps: Add dependency on OF_RESERVED_MEM on carveout heap Apurva Nandan (4): arm64: dts: ti: k3-j784s4-main: Switch MAIN R5F clusters to Split-mode arm64: dts: ti: k3-am62x-lp-sk: Update SPI NAND flash partitioning scheme arm64: dts: k3-j721s2: Add node for OSPI NAND Flash arm64: dts: ti: k3-am62a7-sk: Enable OSPI NAND Aradhya Bhatia (4): drm/bridge: sii902x: Add device_link dependency with drm device drm/bridge: sii902x: Add Power Management hooks HACK: drm/bridge: ite-it66121: Add drm_connector support drm/tidss: Set OLDI clock to bypass-25MHz during probe Arnd Bergmann (1): samples: pfsm: add CC_CAN_LINK dependency Aswath Govindraju (1): mmc: sdhci_am654: Disable data error interrupts while tuning Benjamin Bara (1): i2c: core: run atomic i2c xfer when !preemptible Bhavya Kapoor (8): arm64: dts: ti: k3-j784s4-mcu-wakeup: Add support for ADC nodes arm64: dts: ti: k3-j784s4-evm: Add pinmux information for ADC arm64: dts: ti: k3-j784s4-main: Enable support for high speed modes arm64: dts: ti: k3-j721s2-common-proc-board: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j784s4-evm: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j721e-common-proc-board: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j7200-common-proc-board: Add pinmux information for mcu uart and wkup uart arm64: dts: ti: k3-j784s4-evm: Add support for MCAN interfaces Bin Liu (4): dt-bindings: serial: add binding documentation for TI PRUSS UART serial: 8250: add pruss uart driver arm: dts: am335x: add pruss uart controller node arm: dts: am335x-evmsk: use pruss uart on the Zigbee header Brandon Brnich (5): media: chips-media: wave5: Update firmware location arm64: dts: ti: k3-j721s2-main: Add sram-size for wave5 arm64: dts: ti: k3-j784s4-main: Add sram-size for wave5 dt-bindings: media: Update DT bindings for wave5 TEMP: media: img: vxe-vxd: decoder: Disable CMA for capture buffers Bryan Brattlof (7): arm64: dts: ti: k3-am64-main: add VTM node arm64: dts: ti: k3-am62-wakeup: add VTM node arm64: dts: ti: k3-am62a-wakeup: add VTM node thermal/drivers/k3_j72xx_bandgap: Simplify k3_thermal_get_temp() function dt-bindings: arm: ti: Add bindings for AM62P5 SoCs arm64: dts: ti: Introduce AM62P5 family of SoCs arm64: dts: ti: Add support for the AM62P5 Starter Kit Dan Carpenter (2): mfd: tps6594: Fix an error code in probe() net: ethernet: ti: am65-cpsw: Call of_node_put() on error path Darren Etheridge (5): media: img: vxe-vxd: enable GStreamer 1.20.5 media: platform: img: add missing mutex around function media: platform: img: vxd: fix the error handling media: platform: img: vxd add a sequencing mutex media: platform: img: vxe: finish adding profile/level and tool selection Dasnavis Sabiya (24): arm64: dts: ti: k3-am69-sk: Add eMMC mmc0 support arm64: dts: ti: k3-am69-sk: Enable mcu network port arm64: dts: ti: k3-am69-s
