Message ID | 20200922164016.30979-1-amit.kumar-mahapatra@xilinx.com |
---|---|
Headers | show |
Series | spi: spi-zynqmp-gqspi: Update driver to use spi-mem framework | expand |
On Tue, Sep 22, 2020 at 10:40:14AM -0600, Amit Kumar Mahapatra wrote:
> Fix kernel-doc warnings in ZynqMP qspi driver file.
This *still* doesn't apply against current code:
$ git am -3 --signoff ~/queue/spi/next/20200922_amit_kumar_mahapatra_spi_spi_zynqmp_gqspi_update_driver_to_use_spi_mem_framework.mbx
Applying: spi: spi-zynqmp-gqspi: Fix kernel-doc warnings
Using index info to reconstruct a base tree...
error: patch failed: drivers/spi/spi-zynqmp-gqspi.c:173
error: drivers/spi/spi-zynqmp-gqspi.c: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Are you positive that you are using my for-5.10 branch and that your
mail server is not mangling the patches you are sending? I also tried
with plain patch and had similar results with almost all hunks in this
series failing to apply.
Hi, On 23. 09. 20 20:34, Mark Brown wrote: > On Tue, Sep 22, 2020 at 10:40:14AM -0600, Amit Kumar Mahapatra > wrote: >> Fix kernel-doc warnings in ZynqMP qspi driver file. > > This *still* doesn't apply against current code: > > $ git am -3 --signoff > ~/queue/spi/next/20200922_amit_kumar_mahapatra_spi_spi_zynqmp_gqspi_update_driver_to_use_spi_mem_framework.mbx > > Applying: spi: spi-zynqmp-gqspi: Fix kernel-doc warnings > Using index info to reconstruct a base tree... error: patch failed: > drivers/spi/spi-zynqmp-gqspi.c:173 error: > drivers/spi/spi-zynqmp-gqspi.c: patch does not apply error: Did you > hand edit your patch? It does not apply to blobs recorded in its > index. > > Are you positive that you are using my for-5.10 branch and that > your mail server is not mangling the patches you are sending? I > also tried with plain patch and had similar results with almost all > hunks in this series failing to apply. > I have looked at it. The first issue is that there is still footer and and raw patch is broken. Direct patches I got are fine but not that one which are recorded in lore. Anyway I have resend the whole series myself and will work with Amit to fix his setup. Thanks for your paitience, Michal
On Tue, 22 Sep 2020 10:40:13 -0600, Amit Kumar Mahapatra wrote: > This patch series: > - Fixes kernel-doc warnings in ZynqMP qspi controller driver file. > - Updates the ZynqMP qspi controller driver to use spi-mem framework. > - Fixes incorrect indentation in ZynqMP qspi controller driver file. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/3] spi: spi-zynqmp-gqspi: Fix kernel-doc warnings commit: 91af6eb04a6bbdb8bec8ed6d8ac7850a26604bad [2/3] spi: spi-zynqmp-gqspi: Update driver to use spi-mem framework commit: 1c26372e5aa9e53391a1f8fe0dc7cd93a7e5ba9e [3/3] spi: spi-zynqmp-gqspi: Fix incorrect indentation commit: f09a433b1e4057e6379b7e1207548fff30d5dca3 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