Hi Stephen,
On Fri, 12 Feb 2021 15:31:42 +1100 Stephen Rothwell
wrote:
>
> Hi all,
>
> Today's linux-next merge of the spi tree got a conflict in:
>
> drivers/spi/spi-mpc52xx.c
>
> between commit:
>
> e10656114d32 ("spi: mpc52xx: Avoid using get_tbl()")
>
> from the powerpc tree and com
Hi Mark,
On Fri, 12 Feb 2021 12:27:59 + Mark Brown wrote:
>
> On Fri, Feb 12, 2021 at 03:31:42PM +1100, Stephen Rothwell wrote:
>
> > BTW Mark: the author's address in 258ea99fe25a uses a non existent domain
> > :-(
>
> Ugh, I think that's something gone wrong with b4 :( A bit late now
On Fri, Feb 12, 2021 at 03:31:42PM +1100, Stephen Rothwell wrote:
> BTW Mark: the author's address in 258ea99fe25a uses a non existent domain :-(
Ugh, I think that's something gone wrong with b4 :( A bit late now to
try to fix it up.
signature.asc
Description: PGP signature
Hi all,
Today's linux-next merge of the spi tree got a conflict in:
drivers/spi/spi-mpc52xx.c
between commit:
e10656114d32 ("spi: mpc52xx: Avoid using get_tbl()")
from the powerpc tree and commit:
258ea99fe25a ("spi: spi-mpc52xx: Use new structure for SPI transfer delays")
from the spi
Hi all,
On Wed, 8 Jul 2020 14:37:59 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the spi tree got conflicts in:
>
> drivers/memory/Kconfig
> drivers/memory/Makefile
>
> between commit:
>
> 66b8173a197f ("memory: stm32-fmc2-ebi: add STM32 FMC2 EBI controller
> driver")
Hi all,
Today's linux-next merge of the spi tree got conflicts in:
drivers/memory/Kconfig
drivers/memory/Makefile
between commit:
66b8173a197f ("memory: stm32-fmc2-ebi: add STM32 FMC2 EBI controller driver")
from the mtd tree and commit:
ca7d8b980b67 ("memory: add Renesas RPC-IF drive
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
arch/mips/ath79/dev-spi.h
between commit:
85b9686dae30 ("MIPS: ath79: drop platform device registration code")
from the mips tree and commit:
b172fd0c8980 ("spi: ath79: Enable support for compile test")
from the spi t
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
drivers/spi/Kconfig
between commit:
588020dcb92a ("treewide: simplify Kconfig dependencies for removed archs")
from the asm-generic tree and commit:
e3d001a0c29d ("spi: kconfig: Remove AVR32 dep. from SPI_ATMEL")
from
Hi all,
On Thu, 17 Aug 2017 13:23:08 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the spi tree got a conflict in:
>
> drivers/spi/spi.c
>
> between commit:
>
> 8a2e487e6fc1 ("spi: Use Apple device properties in absence of ACPI
> resources")
>
> from the pm tree and comm
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
drivers/spi/spi.c
between commit:
8a2e487e6fc1 ("spi: Use Apple device properties in absence of ACPI resources")
from the pm tree and commit:
9b61e302210e ("spi: Pick spi bus number from Linux idr or spi alias")
from
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
drivers/acpi/acpi_apd.c
between commit:
6e14cf361a0c ("ACPI / APD: Add clock frequency for Hisilicon Hip07/08 I2C
controller")
from the pm tree and commit:
251831bd4f49 ("spi: xlp: update for ARCH_VULCAN2")
from the
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
drivers/nfc/trf7970a.c
between commit:
3c39c1a54a26 ("NFC: trf7970a: Add OF match table")
from the net-next tree and commit:
3821a065f567 ("spi: Drop owner assignment from spi_drivers")
from the spi tree.
I fixed it
On Fri, 20 Mar 2015 16:23:54 +1100
Stephen Rothwell wrote:
> Today's linux-next merge of the spi tree got a conflict in
> Documentation/spi/spidev_test.c between commit 988b22c519c8 ("spi:
> spidev_test: Added functionalities") from the jc_docs tree and commits
> b78ce7ed5409 ("spi: spidev_test:
On Fri, Mar 20, 2015 at 04:23:54PM +1100, Stephen Rothwell wrote:
> Clearly the one commit in the jc_docs tree is supposed to do the same
> as three commits in the spi tree. The jc_docs tree version has an
> older Author date, but a newer commit date ...
> I fixed it up (by using the spi tree ve
Hi all,
On Fri, 20 Mar 2015 16:23:54 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the spi tree got a conflict in
> Documentation/spi/spidev_test.c between commit 988b22c519c8 ("spi:
> spidev_test: Added functionalities") from the jc_docs tree and commits
> b78ce7ed5409 ("spi: sp
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in
Documentation/spi/spidev_test.c between commit 988b22c519c8 ("spi:
spidev_test: Added functionalities") from the jc_docs tree and commits
b78ce7ed5409 ("spi: spidev_test: Cleaned hexadecimal dump"),
31a5c5a72b90 ("") and ("") fro
On Thu, Mar 19, 2015 at 02:48:34PM +1100, Stephen Rothwell wrote:
> Hi Mark,
>
> Today's linux-next merge of the spi tree got conflicts in
> drivers/dma/intel_mid_dma_regs.h and drivers/dma/intel_mid_dma.c
> between commit 3b62286d0ef7 ("dmaengine: Remove FSF mailing addresses")
> from the slave-d
Hi Mark,
Today's linux-next merge of the spi tree got conflicts in
drivers/dma/intel_mid_dma_regs.h and drivers/dma/intel_mid_dma.c
between commit 3b62286d0ef7 ("dmaengine: Remove FSF mailing addresses")
from the slave-dma tree and commit 36111da7838e ("dmaengine:
intel-mid-dma: remove the driver"
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi-mpc512x-psc.c between commit 9d37619fb37f ("spi: mpc512x:
adjust to OF based clock lookup") from the mpc5xxx tree and commit
e1d0cd473be4 ("spi: mpc512x: Use devm_*() functions") from the spi tree.
I fixed it up (
On Mon, Oct 14, 2013 at 04:48:08PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the spi tree got a conflict in
>
> drivers/spi/spi.c
>
> Caused by commits cf9eb39 (spi: Fix modalias for ACPI enumerated SPI devices)
> and 33cf00e (spi: attach/detach SPI device to the ACPI power
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi.c
Caused by commits cf9eb39 (spi: Fix modalias for ACPI enumerated SPI devices)
and 33cf00e (spi: attach/detach SPI device to the ACPI power domain).
I fixed it up (see below). Please verify that the resolution lo
Hi Grant,
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi-s3c64xx.c between commit b5be04d35dbb ("spi: s3c64xx:
Modify SPI driver to use generic DMA DT support") from the sound-asoc tree and
commit 75bf33611041 ("spi/s3c64xx: fix checkpatch warnings and error")
from the
On Thu, Nov 15, 2012 at 4:01 AM, Stephen Rothwell wrote:
> Hi Grant,
>
> Today's linux-next merge of the spi tree got a conflict in
> drivers/spi/spi-xcomm.c between commit b31659004337 ("spi: Add
> AD-FMCOMMS1-EBZ I2C-SPI bridge driver") from Linus' tree and commit
> 0e312dcca718 ("spi/xcomm: Add
Hi Grant,
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi-xcomm.c between commit b31659004337 ("spi: Add
AD-FMCOMMS1-EBZ I2C-SPI bridge driver") from Linus' tree and commit
0e312dcca718 ("spi/xcomm: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver")
from the spi tree.
OK, so t
24 matches
Mail list logo
