| Message ID | 20210423182441.50272-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | spi: pxa2xx: Set of cleanups | expand |
On Fri, Apr 23, 2021 at 9:25 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > Set of cleanups here and there related to the SPI PXA2xx driver. > On top of them, adding the special type for Intel Merrifield. Mark, are you accepting patches for v5.14 now, or should I resend after v5.13-rc1 is out? (I have few more in my queue :-) > In v2: > - cover letter (Mark) > - drop moving the header in patch 5 (Mark) > > Andy Shevchenko (14): > spi: pxa2xx: Use one point of return when ->probe() fails > spi: pxa2xx: Utilize MMIO and physical base from struct ssp_device > spi: pxa2xx: Utilize struct device from struct ssp_device > spi: pxa2xx: Replace header inclusions by forward declarations > spi: pxa2xx: Unify ifdeffery used in the headers > spi: pxa2xx: Group Intel Quark specific definitions > spi: pxa2xx: Introduce int_stop_and_reset() helper > spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort() > spi: pxa2xx: Use pxa_ssp_enable()/pxa_ssp_disable() in the driver > spi: pxa2xx: Extract pxa2xx_spi_update() helper > spi: pxa2xx: Extract clear_SSCR1_bits() helper > spi: pxa2xx: Extract read_SSSR_bits() helper > spi: pxa2xx: Constify struct driver_data parameter > spi: pxa2xx: Introduce special type for Merrifield SPIs > > drivers/spi/spi-pxa2xx-dma.c | 37 +++---- > drivers/spi/spi-pxa2xx-pci.c | 4 +- > drivers/spi/spi-pxa2xx.c | 190 +++++++++++++++++---------------- > drivers/spi/spi-pxa2xx.h | 52 ++++----- > include/linux/pxa2xx_ssp.h | 42 +++++++- > include/linux/spi/pxa2xx_spi.h | 9 +- > sound/soc/pxa/pxa-ssp.c | 16 --- > 7 files changed, 185 insertions(+), 165 deletions(-) > > -- > 2.30.2 >
On Tue, Apr 27, 2021 at 02:46:02PM +0300, Andy Shevchenko wrote: > Mark, are you accepting patches for v5.14 now, or should I resend > after v5.13-rc1 is out? > (I have few more in my queue :-) Send them now if you like.
On Tue, Apr 27, 2021 at 03:34:57PM +0100, Mark Brown wrote: > On Tue, Apr 27, 2021 at 02:46:02PM +0300, Andy Shevchenko wrote: > > > Mark, are you accepting patches for v5.14 now, or should I resend > > after v5.13-rc1 is out? > > > (I have few more in my queue :-) > > Send them now if you like. Got it! I think I prefer to produce a less noise in case this series for some reason needs to be changed / amended. I'll wait till this series lands in your queue. P.S. basically my question was about this series.
On Tue, Apr 27, 2021 at 5:54 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > On Tue, Apr 27, 2021 at 03:34:57PM +0100, Mark Brown wrote: > > On Tue, Apr 27, 2021 at 02:46:02PM +0300, Andy Shevchenko wrote: > > > > > Mark, are you accepting patches for v5.14 now, or should I resend > > > after v5.13-rc1 is out? > > > > > (I have few more in my queue :-) > > > > Send them now if you like. > > Got it! > > I think I prefer to produce a less noise in case this series for some reason > needs to be changed / amended. I'll wait till this series lands in your queue. > > P.S. basically my question was about this series. One item is still unclear to me. I noticed that you started already applying patches for-next release cycle (if I understood it correctly). Hence the question should or shouldn't I resend this series after rc1 is out? If I shouldn't, do you have any comments on it? If no, can it be applied now?
On Fri, Apr 30, 2021 at 07:29:48PM +0300, Andy Shevchenko wrote: > One item is still unclear to me. I noticed that you started already > applying patches for-next release cycle (if I understood it > correctly). Hence the question should or shouldn't I resend this No I haven't, I'm only applying things to for-5.13. I've not even created for-5.14 yet, that will only get created once -rc1 is out and nothing for it is fixed yet. If I look at it and find an issue I will tell you, if I've not said anything and I've got through my first batch of v5.14 stuff it's gone AWOL and you should resend.
On Fri, Apr 30, 2021 at 9:01 PM Mark Brown <broonie@kernel.org> wrote: > On Fri, Apr 30, 2021 at 07:29:48PM +0300, Andy Shevchenko wrote: > > > One item is still unclear to me. I noticed that you started already > > applying patches for-next release cycle (if I understood it > > correctly). Hence the question should or shouldn't I resend this > > No I haven't, I'm only applying things to for-5.13. I've not even > created for-5.14 yet, that will only get created once -rc1 is out and > nothing for it is fixed yet. If I look at it and find an issue I will > tell you, if I've not said anything and I've got through my first batch > of v5.14 stuff it's gone AWOL and you should resend. Ah, okay, it means I misread the idea of applied patches. Thanks for clarifying this for me!
On Fri, 23 Apr 2021 21:24:27 +0300, Andy Shevchenko wrote: > Set of cleanups here and there related to the SPI PXA2xx driver. > On top of them, adding the special type for Intel Merrifield. > > In v2: > - cover letter (Mark) > - drop moving the header in patch 5 (Mark) > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [01/14] spi: pxa2xx: Use one point of return when ->probe() fails commit: f2eed8caa336e31d672804a8725dadba0415f19d [02/14] spi: pxa2xx: Utilize MMIO and physical base from struct ssp_device commit: 9e43c9a8d5de4810ea9688519d55b5e46784d84a [03/14] spi: pxa2xx: Utilize struct device from struct ssp_device commit: c3dce24c40cc7cd07deca5b81b763eae66f30856 [04/14] spi: pxa2xx: Replace header inclusions by forward declarations commit: 0e4768713e71dd224633fd7e00ad358bc48f433a [05/14] spi: pxa2xx: Unify ifdeffery used in the headers commit: 5edc24901f4d469f8fc943004f73655933e89dbf [06/14] spi: pxa2xx: Group Intel Quark specific definitions commit: 1beb37b0e3f98708bfb37778049764b4500756da [07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper (no commit info) [08/14] spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort() (no commit info) [09/14] spi: pxa2xx: Use pxa_ssp_enable()/pxa_ssp_disable() in the driver (no commit info) [10/14] spi: pxa2xx: Extract pxa2xx_spi_update() helper (no commit info) [11/14] spi: pxa2xx: Extract clear_SSCR1_bits() helper (no commit info) [12/14] spi: pxa2xx: Extract read_SSSR_bits() helper (no commit info) [13/14] spi: pxa2xx: Constify struct driver_data parameter (no commit info) [14/14] spi: pxa2xx: Introduce special type for Merrifield SPIs (no commit info) All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
On Tue, May 11, 2021 at 11:27 AM Mark Brown <broonie@kernel.org> wrote: > > On Fri, 23 Apr 2021 21:24:27 +0300, Andy Shevchenko wrote: > > Set of cleanups here and there related to the SPI PXA2xx driver. > > On top of them, adding the special type for Intel Merrifield. > [07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper > (no commit info) > [08/14] spi: pxa2xx: Reuse int_error_stop() in pxa2xx_spi_slave_abort() > (no commit info) > [09/14] spi: pxa2xx: Use pxa_ssp_enable()/pxa_ssp_disable() in the driver > (no commit info) > [10/14] spi: pxa2xx: Extract pxa2xx_spi_update() helper > (no commit info) > [11/14] spi: pxa2xx: Extract clear_SSCR1_bits() helper > (no commit info) > [12/14] spi: pxa2xx: Extract read_SSSR_bits() helper > (no commit info) > [13/14] spi: pxa2xx: Constify struct driver_data parameter > (no commit info) > [14/14] spi: pxa2xx: Introduce special type for Merrifield SPIs > (no commit info) The above patches are effectively missed. Anything to fix in your scripts / my patches? The below does not shed a light. > All being well this means that it will be integrated into the linux-next > tree (usually sometime in the next 24 hours) and sent to Linus during > the next merge window (or sooner if it is a bug fix), however if > problems are discovered then the patch may be dropped or reverted. > > You may get further e-mails resulting from automated or manual testing > and review of the tree, please engage with people reporting problems and > send followup patches addressing any issues that are reported if needed. > > If any updates are required or you are submitting further changes they > should be sent as incremental updates against current git, existing > patches will not be replaced. > > Please add any relevant lists and maintainers to the CCs when replying > to this mail.
On Tue, May 11, 2021 at 03:28:18PM +0300, Andy Shevchenko wrote: > On Tue, May 11, 2021 at 11:27 AM Mark Brown <broonie@kernel.org> wrote: > > On Fri, 23 Apr 2021 21:24:27 +0300, Andy Shevchenko wrote: > > > Set of cleanups here and there related to the SPI PXA2xx driver. > > > On top of them, adding the special type for Intel Merrifield. > > [07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper > > (no commit info) > The above patches are effectively missed. > Anything to fix in your scripts / my patches? Like I said, patch 7 didn't apply so you should check and resend.
On Tue, May 11, 2021 at 4:47 PM Mark Brown <broonie@kernel.org> wrote: > > On Tue, May 11, 2021 at 03:28:18PM +0300, Andy Shevchenko wrote: > > On Tue, May 11, 2021 at 11:27 AM Mark Brown <broonie@kernel.org> wrote: > > > > On Fri, 23 Apr 2021 21:24:27 +0300, Andy Shevchenko wrote: > > > > Set of cleanups here and there related to the SPI PXA2xx driver. > > > > On top of them, adding the special type for Intel Merrifield. > > > > [07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper > > > (no commit info) > > > The above patches are effectively missed. > > Anything to fix in your scripts / my patches? > > Like I said, patch 7 didn't apply so you should check and resend. I didn't get it. I have effectively rebased the entire series and resend as v2. I can speculate that your scripts have a bug since they might try v1 as well (as far as I can see they usually send a confirmation of application for all versions of the series in question). Sorry, but I do not see an issue.
On Tue, May 11, 2021 at 4:52 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Tue, May 11, 2021 at 4:47 PM Mark Brown <broonie@kernel.org> wrote: > > > > On Tue, May 11, 2021 at 03:28:18PM +0300, Andy Shevchenko wrote: > > > On Tue, May 11, 2021 at 11:27 AM Mark Brown <broonie@kernel.org> wrote: > > > > > > On Fri, 23 Apr 2021 21:24:27 +0300, Andy Shevchenko wrote: > > > > > Set of cleanups here and there related to the SPI PXA2xx driver. > > > > > On top of them, adding the special type for Intel Merrifield. > > > > > > [07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper > > > > (no commit info) > > > > > The above patches are effectively missed. > > > Anything to fix in your scripts / my patches? > > > > Like I said, patch 7 didn't apply so you should check and resend. > > I didn't get it. I have effectively rebased the entire series and resend as v2. v2 --> v3 v3 https://lore.kernel.org/linux-spi/20210510124134.24638-1-andriy.shevchenko@linux.intel.com/T/#t > I can speculate that your scripts have a bug since they might try v1 v1 --> v1 and / or v2 > as well (as far as I can see they usually send a confirmation of > application for all versions of the series in question). > > Sorry, but I do not see an issue.
On Tue, May 11, 2021 at 04:56:05PM +0300, Andy Shevchenko wrote: > On Tue, May 11, 2021 at 4:52 PM Andy Shevchenko > <andy.shevchenko@gmail.com> wrote: > > On Tue, May 11, 2021 at 4:47 PM Mark Brown <broonie@kernel.org> wrote: > > > > > > On Tue, May 11, 2021 at 03:28:18PM +0300, Andy Shevchenko wrote: > > > > On Tue, May 11, 2021 at 11:27 AM Mark Brown <broonie@kernel.org> wrote: > > > > > > > > On Fri, 23 Apr 2021 21:24:27 +0300, Andy Shevchenko wrote: > > > > > > Set of cleanups here and there related to the SPI PXA2xx driver. > > > > > > On top of them, adding the special type for Intel Merrifield. > > > > > > > > [07/14] spi: pxa2xx: Introduce int_stop_and_reset() helper > > > > > (no commit info) > > > > > > > The above patches are effectively missed. > > > > Anything to fix in your scripts / my patches? > > > > > > Like I said, patch 7 didn't apply so you should check and resend. > > > > I didn't get it. I have effectively rebased the entire series and resend as v2. > > v2 --> v3 > > v3 > https://lore.kernel.org/linux-spi/20210510124134.24638-1-andriy.shevchenko@linux.intel.com/T/#t > > > > I can speculate that your scripts have a bug since they might try v1 > > v1 --> v1 and / or v2 > > > as well (as far as I can see they usually send a confirmation of > > application for all versions of the series in question). > > > > Sorry, but I do not see an issue. Just in case I'll send a v4 with only patches that missed. Otherwise it will be the same as in v3 (see above).
On Tue, May 11, 2021 at 04:52:40PM +0300, Andy Shevchenko wrote: > On Tue, May 11, 2021 at 4:47 PM Mark Brown <broonie@kernel.org> wrote: > > On Tue, May 11, 2021 at 03:28:18PM +0300, Andy Shevchenko wrote: > > > On Tue, May 11, 2021 at 11:27 AM Mark Brown <broonie@kernel.org> wrote: > > > The above patches are effectively missed. > > > Anything to fix in your scripts / my patches? > > Like I said, patch 7 didn't apply so you should check and resend. > I didn't get it. I have effectively rebased the entire series and resend as v2. No, you resent it again as v3. This was me applying the bits of v2 that would actually apply. > I can speculate that your scripts have a bug since they might try v1 > as well (as far as I can see they usually send a confirmation of > application for all versions of the series in question). They end up sending confirmations for every version of the series I've tried to queue unless I go and explicitly delete the older versions.
On Tue, May 11, 2021 at 05:13:24PM +0300, Andy Shevchenko wrote: > Just in case I'll send a v4 with only patches that missed. > Otherwise it will be the same as in v3 (see above). Please stop.
On Tue, May 11, 2021 at 5:25 PM Mark Brown <broonie@kernel.org> wrote: > On Tue, May 11, 2021 at 05:13:24PM +0300, Andy Shevchenko wrote: > > > Just in case I'll send a v4 with only patches that missed. > > Otherwise it will be the same as in v3 (see above). > > Please stop. Okay, what should I do?
On Tue, May 11, 2021 at 05:28:13PM +0300, Andy Shevchenko wrote: > On Tue, May 11, 2021 at 5:25 PM Mark Brown <broonie@kernel.org> wrote: > > Please stop. > Okay, what should I do? Nothing. Just stop sending this out until I've had a chance to handle the current version.
On Tue, May 11, 2021 at 5:38 PM Mark Brown <broonie@kernel.org> wrote: > > On Tue, May 11, 2021 at 05:28:13PM +0300, Andy Shevchenko wrote: > > On Tue, May 11, 2021 at 5:25 PM Mark Brown <broonie@kernel.org> wrote: > > > > Please stop. > > > Okay, what should I do? > > Nothing. Just stop sending this out until I've had a chance to handle > the current version. Thanks, and sorry for the mess. v4 I have sent before had a chance to read your previous email(s). No more versions this week for sure, and sorry again.