Messages in this thread | | | Date | Thu, 23 Apr 2020 15:51:33 +0200 | From | Greg Kroah-Hartman <> | Subject | Re: [PATCH v2 01/17] tty: serial: qcom_geni_serial: Use OPP API to set clk/perf state |
| |
On Wed, Apr 22, 2020 at 02:52:21PM +0530, Rajendra Nayak wrote: > Hey Bjorn, > > > diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h > > index dd46494..737e713 100644 > > --- a/include/linux/qcom-geni-se.h > > +++ b/include/linux/qcom-geni-se.h > > @@ -24,6 +24,7 @@ enum geni_se_protocol_type { > > struct geni_wrapper; > > struct clk; > > +struct opp_table; > > /** > > * struct geni_se - GENI Serial Engine > > @@ -39,6 +40,7 @@ struct geni_se { > > struct device *dev; > > struct geni_wrapper *wrapper; > > struct clk *clk; > > + struct opp_table *opp; > > I just realized this is going to cause merge issues across geni serial and geni spi > driver (PATCH 02/17 in this series) unless all of this goes via your tree. > I see this is also an issue with the ongoing ICC patch series [1] > > Do you or Greg have any thoughts on how this common header across various drivers > issue should be resolved to avoid conflicts while merging?
I can ack it and you can take it through a different tree as part of the whole series to prevent that.
thanks,
greg k-h
| |