diff for duplicates of <20190502190845.GA19485@archlinux-i9> diff --git a/a/1.txt b/N1/1.txt index a037c71..12251bd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -376,8 +376,7 @@ On Thu, May 02, 2019 at 09:00:58PM +0200, Anders Roxell wrote: > > CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c > > CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst > > CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt -> > $ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr360 - 57.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h +> > $ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr36057.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h > > Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next) > > Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) > > Merging slave-dma/next (c6504be53972 dmaengine: stm32-dma: Fix unsigned variable compared with zero) diff --git a/a/content_digest b/N1/content_digest index 852e773..8774d7f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -391,8 +391,7 @@ "> > CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c\n" "> > CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst\n" "> > CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt\n" - "> > $ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr360\n" - " 57.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h\n" + "> > $ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr36057.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h\n" "> > Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)\n" "> > Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)\n" "> > Merging slave-dma/next (c6504be53972 dmaengine: stm32-dma: Fix unsigned variable compared with zero)\n" @@ -533,4 +532,4 @@ "\n" Cheers, -41a2ea496fda91cc47fab6a7295688a34a7cfdc490a21cfddda5b2d4206e6432 +e2f95a2788c00fb1c9dce1399399348ec9629097cfe9bccb1c5de3bba43c282c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.