* [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() [not found] <20210430152156.21162-1-jim2101024@gmail.com> @ 2021-04-30 15:21 ` Jim Quinlan 2021-05-03 18:56 ` Bjorn Helgaas 0 siblings, 1 reply; 5+ messages in thread From: Jim Quinlan @ 2021-04-30 15:21 UTC (permalink / raw) To: Bjorn Helgaas, Amjad Ouled-Ameur, Philipp Zabel, linux-pci, Nicolas Saenz Julienne, bcm-kernel-feedback-list, james.quinlan, jim2101024 Cc: stable, open list All other functions are defined for when CONFIG_RESET_CONTROLLER is not set. Fixes: 557acb3d2cd9 ("reset: make shared pulsed reset controls re-triggerable") CC: stable@vger.kernel.org # v5.11+ Signed-off-by: Jim Quinlan <jim2101024@gmail.com> --- include/linux/reset.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/reset.h b/include/linux/reset.h index b9109efa2a5c..9700124affa3 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -47,6 +47,11 @@ static inline int reset_control_reset(struct reset_control *rstc) return 0; } +static inline int reset_control_rearm(struct reset_control *rstc) +{ + return 0; +} + static inline int reset_control_assert(struct reset_control *rstc) { return 0; -- 2.17.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() 2021-04-30 15:21 ` [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() Jim Quinlan @ 2021-05-03 18:56 ` Bjorn Helgaas 2021-05-10 7:45 ` Philipp Zabel 0 siblings, 1 reply; 5+ messages in thread From: Bjorn Helgaas @ 2021-05-03 18:56 UTC (permalink / raw) To: Jim Quinlan, Philipp Zabel Cc: Amjad Ouled-Ameur, linux-pci, Nicolas Saenz Julienne, bcm-kernel-feedback-list, james.quinlan, stable, open list On Fri, Apr 30, 2021 at 11:21:54AM -0400, Jim Quinlan wrote: > All other functions are defined for when CONFIG_RESET_CONTROLLER > is not set. > > Fixes: 557acb3d2cd9 ("reset: make shared pulsed reset controls re-triggerable") > CC: stable@vger.kernel.org # v5.11+ > Signed-off-by: Jim Quinlan <jim2101024@gmail.com> Philipp, I'd like to merge this via the PCI tree since the brcmstb patch depends on it. It looks correct to me, but I'd really like to have your ack before merging it. > --- > include/linux/reset.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/include/linux/reset.h b/include/linux/reset.h > index b9109efa2a5c..9700124affa3 100644 > --- a/include/linux/reset.h > +++ b/include/linux/reset.h > @@ -47,6 +47,11 @@ static inline int reset_control_reset(struct reset_control *rstc) > return 0; > } > > +static inline int reset_control_rearm(struct reset_control *rstc) > +{ > + return 0; > +} > + > static inline int reset_control_assert(struct reset_control *rstc) > { > return 0; > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() 2021-05-03 18:56 ` Bjorn Helgaas @ 2021-05-10 7:45 ` Philipp Zabel 2021-05-10 18:54 ` Bjorn Helgaas 0 siblings, 1 reply; 5+ messages in thread From: Philipp Zabel @ 2021-05-10 7:45 UTC (permalink / raw) To: Bjorn Helgaas, Jim Quinlan Cc: Amjad Ouled-Ameur, linux-pci, Nicolas Saenz Julienne, bcm-kernel-feedback-list, james.quinlan, stable, open list On Mon, 2021-05-03 at 13:56 -0500, Bjorn Helgaas wrote: > On Fri, Apr 30, 2021 at 11:21:54AM -0400, Jim Quinlan wrote: > > All other functions are defined for when CONFIG_RESET_CONTROLLER > > is not set. > > > > Fixes: 557acb3d2cd9 ("reset: make shared pulsed reset controls re-triggerable") > > CC: stable@vger.kernel.org # v5.11+ > > Signed-off-by: Jim Quinlan <jim2101024@gmail.com> > > Philipp, I'd like to merge this via the PCI tree since the brcmstb > patch depends on it. It looks correct to me, but I'd really like to > have your ack before merging it. Acked-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() 2021-05-10 7:45 ` Philipp Zabel @ 2021-05-10 18:54 ` Bjorn Helgaas 0 siblings, 0 replies; 5+ messages in thread From: Bjorn Helgaas @ 2021-05-10 18:54 UTC (permalink / raw) To: Philipp Zabel Cc: Jim Quinlan, Amjad Ouled-Ameur, linux-pci, Nicolas Saenz Julienne, bcm-kernel-feedback-list, james.quinlan, stable, open list On Mon, May 10, 2021 at 09:45:54AM +0200, Philipp Zabel wrote: > On Mon, 2021-05-03 at 13:56 -0500, Bjorn Helgaas wrote: > > On Fri, Apr 30, 2021 at 11:21:54AM -0400, Jim Quinlan wrote: > > > All other functions are defined for when CONFIG_RESET_CONTROLLER > > > is not set. > > > > > > Fixes: 557acb3d2cd9 ("reset: make shared pulsed reset controls re-triggerable") > > > CC: stable@vger.kernel.org # v5.11+ > > > Signed-off-by: Jim Quinlan <jim2101024@gmail.com> > > > > Philipp, I'd like to merge this via the PCI tree since the brcmstb > > patch depends on it. It looks correct to me, but I'd really like to > > have your ack before merging it. > > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Thanks a lot! I wanted to include this for v5.13, so I took the liberty of including it without your ack, so I'm glad you agree ;) Sorry for the late ack request. https://git.kernel.org/linus/48582b2e3b87 ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <20210430151949.20849-1-jim2101024@gmail.com>]
* [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() [not found] <20210430151949.20849-1-jim2101024@gmail.com> @ 2021-04-30 15:19 ` Jim Quinlan 0 siblings, 0 replies; 5+ messages in thread From: Jim Quinlan @ 2021-04-30 15:19 UTC (permalink / raw) To: james.quinlan, jim2101024; +Cc: stable All other functions are defined for when CONFIG_RESET_CONTROLLER is not set. Fixes: 557acb3d2cd9 ("reset: make shared pulsed reset controls re-triggerable") CC: stable@vger.kernel.org # v5.11+ Signed-off-by: Jim Quinlan <jim2101024@gmail.com> --- include/linux/reset.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/reset.h b/include/linux/reset.h index b9109efa2a5c..9700124affa3 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h @@ -47,6 +47,11 @@ static inline int reset_control_reset(struct reset_control *rstc) return 0; } +static inline int reset_control_rearm(struct reset_control *rstc) +{ + return 0; +} + static inline int reset_control_assert(struct reset_control *rstc) { return 0; -- 2.17.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-10 18:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20210430152156.21162-1-jim2101024@gmail.com>
2021-04-30 15:21 ` [PATCH v6 1/3] reset: add missing empty function reset_control_rearm() Jim Quinlan
2021-05-03 18:56 ` Bjorn Helgaas
2021-05-10 7:45 ` Philipp Zabel
2021-05-10 18:54 ` Bjorn Helgaas
[not found] <20210430151949.20849-1-jim2101024@gmail.com>
2021-04-30 15:19 ` Jim Quinlan
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).