[LEDE-DEV] [PATCH] kernel: update kernel 4.4 to version 4.4.30

Tue Nov 1 20:17:23 PDT 2016

On Wed, Nov 2, 2016 at 3:09 AM, Stijn Segers
<francesco.borromini at inventati.org> wrote:
> Hi,
>
> I rely on KanjiMonster's script to adjust the patches, so they apply
> cleanly. Without it, if you start a verbose build, you'd see 'patch applied
> with fuzz 2' etc. With the amount of patches a project like this one has,
> clean patches eliminate redundant output and allow you to zoom in quicker on
> the correct lines in the source code (and the part of the patch that breaks
> them).
>
> https://gist.github.com/KanjiMonster/dfcd1af3190aa7b2941f1bdcb119f25e
>
> Cheers
>
> Stijn
>
> Op di, 1 nov 2016 om 6:58 , schreef p.wassi at gmx.at:
>
>>>  This patch bumps the 4.4 kernel from .28 to .30 and refreshes the
>>> patches.
>>
>>
>> A question regarding the 'patch refreshing' and my previous patch for
>> 4.4.29.
>> I want to figure out where my workflow is erroneous, or what things I did
>> not
>> understand when refreshing a patch series during a kernel upgrade like
>> this.
>> For example let me take the first refreshing you submitted
>> (besides 4.4.28->30 in kernel-version.mk):
>>
>> The file
>> 'target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch'
>> patches the kernel driver 'drivers/mtd/spi-nor/spi-nor.c'
>> Now with your patch refreshing, you adjust the offsets in spi-nor.c
>> However, this file (spi-nor.c) was last changed back in July (2016-07-14).
>> So why is it required to refresh this patch on 4.4.28 -> .30, when this
>> file was last changed during 4.4.15 -> .16 ?
>>
>> Don't get me wrong, I just want to understand where I have to adjust my
>> workflow.
>>
>> Best regards,
>> P. Wassi
>


I find it quite odd that it doesnt apply cleanly to my LEDE tree at git rev

commit 411babb28a3091f693832fb30d475aa1e99c6d11
which is a merge of the latest ipfilters changes

eb10b13f16bfebdbda5c473c55c0520b8992b6da


patch -c -p1 < ../lede-zbt-4.4.30.patch
patching file include/kernel-version.mk
patching file target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch.rej
patching file target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch
Hunk #1 FAILED at 68.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/brcm63xx/patches-4.4/000-4.5-03-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch.rej
patching file target/linux/generic/patches-4.4/051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch
Hunk #1 FAILED at 105.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/generic/patches-4.4/051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch.rej
patching file target/linux/generic/patches-4.4/477-mtd-add-spi-nor-add-mx25u3235f.patch
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/generic/patches-4.4/477-mtd-add-spi-nor-add-mx25u3235f.patch.rej
patching file target/linux/lantiq/patches-4.4/0153-lantiq-VPE-softdog.patch
patching file target/linux/lantiq/patches-4.4/122-MIPS-store-the-appended-dtb-address-in-a-variable.patch
Hunk #1 FAILED at 36.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/lantiq/patches-4.4/122-MIPS-store-the-appended-dtb-address-in-a-variable.patch.rej
patching file target/linux/layerscape/patches-4.4/1074-mtd-nand-spi-nor-assign-MTD-of_node.patch
Hunk #1 FAILED at 21.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1074-mtd-nand-spi-nor-assign-MTD-of_node.patch.rej
patching file target/linux/layerscape/patches-4.4/1075-mtd-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch
Hunk #1 FAILED at 69.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1075-mtd-spi-nor-convert-to-spi_nor_-get-set-_flash_node.patch.rej
patching file target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch
Hunk #1 FAILED at 14.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1078-mtd-spi-nor-drop-flash_node-field.patch.rej
patching file target/linux/layerscape/patches-4.4/1079-mtd-spi-nor-remove-unnecessary-leading-space-from-db.patch
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1079-mtd-spi-nor-remove-unnecessary-leading-space-from-db.patch.rej
patching file target/linux/layerscape/patches-4.4/1081-mtd-spi-nor-provide-default-erase_sector-implementat.patch
Hunk #1 FAILED at 69.
Hunk #2 FAILED at 78.
2 out of 2 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1081-mtd-spi-nor-provide-default-erase_sector-implementat.patch.rej
patching file target/linux/layerscape/patches-4.4/1083-mtd-spi-nor-Fix-error-message-with-unrecognized-JEDE.patch
Hunk #1 FAILED at 20.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1083-mtd-spi-nor-Fix-error-message-with-unrecognized-JEDE.patch.rej
patching file target/linux/layerscape/patches-4.4/1085-mtd-spi-nor-Check-the-return-value-from-read_sr.patch
Hunk #1 FAILED at 47.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1085-mtd-spi-nor-Check-the-return-value-from-read_sr.patch.rej
patching file target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch
Hunk #1 FAILED at 24.
Hunk #2 FAILED at 51.
Hunk #3 FAILED at 73.
3 out of 3 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1090-mtd-spi-nor-Add-SPI-NOR-layer-PM-support.patch.rej
patching file target/linux/layerscape/patches-4.4/1093-mtd-spi-nor-check-return-value-from-read-write.patch
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 26.
Hunk #3 FAILED at 43.
Hunk #4 FAILED at 60.
Hunk #5 FAILED at 90.
Hunk #6 FAILED at 112.
6 out of 6 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1093-mtd-spi-nor-check-return-value-from-read-write.patch.rej
patching file target/linux/layerscape/patches-4.4/1094-mtd-spi-nor-stop-passing-around-retlen.patch
Hunk #1 FAILED at 113.
Hunk #2 FAILED at 128.
Hunk #3 FAILED at 137.
Hunk #4 FAILED at 146.
Hunk #5 FAILED at 155.
Hunk #6 FAILED at 166.
Hunk #7 FAILED at 186.
7 out of 7 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1094-mtd-spi-nor-stop-passing-around-retlen.patch.rej
patching file target/linux/layerscape/patches-4.4/1095-mtd-spi-nor-simplify-write-loop.patch
Hunk #1 FAILED at 18.
Hunk #2 FAILED at 29.
2 out of 2 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1095-mtd-spi-nor-simplify-write-loop.patch.rej
patching file target/linux/layerscape/patches-4.4/1096-mtd-spi-nor-add-read-loop.patch
Hunk #1 FAILED at 15.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1096-mtd-spi-nor-add-read-loop.patch.rej
patching file target/linux/layerscape/patches-4.4/1100-mtd-spi_nor-Disable-Micron-flash-HW-protection.patch
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1100-mtd-spi_nor-Disable-Micron-flash-HW-protection.patch.rej
patching file target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch
Hunk #1 FAILED at 33.
Hunk #2 FAILED at 41.
Hunk #3 FAILED at 95.
3 out of 3 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch.rej
patching file target/linux/layerscape/patches-4.4/1105-mtd-spi-nor-add-DDR-quad-read-support.patch
Hunk #1 FAILED at 53.
Hunk #2 FAILED at 63.
Hunk #3 FAILED at 87.
Hunk #4 FAILED at 105.
Hunk #5 FAILED at 120.
Hunk #6 FAILED at 130.
6 out of 6 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1105-mtd-spi-nor-add-DDR-quad-read-support.patch.rej
patching file target/linux/layerscape/patches-4.4/1109-drivers-mtd-spi-nor-Enable-QSPI-Flash-in-Kernel.patch
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 22.
2 out of 2 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1109-drivers-mtd-spi-nor-Enable-QSPI-Flash-in-Kernel.patch.rej
patching file target/linux/layerscape/patches-4.4/1110-mtd-spi-nor-fsl-quad-add-flash-S25FS-extra-support.patch
Hunk #1 FAILED at 116.
Hunk #2 FAILED at 124.
Hunk #3 FAILED at 136.
3 out of 3 hunks FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1110-mtd-spi-nor-fsl-quad-add-flash-S25FS-extra-support.patch.rej
patching file target/linux/layerscape/patches-4.4/1111-mtd-spi-nor-disable-4kb-sector-erase-for-s25fl128.patch
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/1111-mtd-spi-nor-disable-4kb-sector-erase-for-s25fl128.patch.rej
patching file target/linux/layerscape/patches-4.4/3023-powerpc-fsl-move-mpc85xx.h-to-include-linux-fsl.patch
Hunk #1 succeeded at 133 with fuzz 2.
patching file target/linux/layerscape/patches-4.4/7017-fsl_qbman-add-qbman-driver.patch
Hunk #1 FAILED at 140.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/7017-fsl_qbman-add-qbman-driver.patch.rej
patching file target/linux/layerscape/patches-4.4/8042-drivers-gpio-Port-gpio-driver-to-support-layerscape-.patch
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/8042-drivers-gpio-Port-gpio-driver-to-support-layerscape-.patch.rej
patching file target/linux/layerscape/patches-4.4/8073-ls1012a-added-clock-configuration.patch
Hunk #1 FAILED at 51.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/layerscape/patches-4.4/8073-ls1012a-added-clock-configuration.patch.rej
patching file target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch
Hunk #1 FAILED at 4296.
Hunk #2 FAILED at 4307.
Hunk #3 FAILED at 4315.
Hunk #4 FAILED at 4342.
Hunk #5 FAILED at 4351.
Hunk #6 FAILED at 4360.
Hunk #7 FAILED at 4369.
Hunk #8 FAILED at 4378.
Hunk #9 FAILED at 4387.
Hunk #10 FAILED at 4400.
Hunk #11 FAILED at 4410.
Hunk #12 FAILED at 4419.
12 out of 12 hunks FAILED -- saving rejects to file
target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch.rej
patching file target/linux/mvebu/patches-4.4/053-ARM-dts-Add-SolidRun-Armada-388-Clearfog-A1-DT-file.patch
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- saving rejects to file
target/linux/mvebu/patches-4.4/053-ARM-dts-Add-SolidRun-Armada-388-Clearfog-A1-DT-file.patch.rej
patching file target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 67.
Hunk #3 FAILED at 82.
3 out of 3 hunks FAILED -- saving rejects to file
target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch.rej
✘  Lx    100%  dingo at localhost  ~/Devel/Wireless/zbt-lede  
master ● ↑5 
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev