On Fri, 16 Aug 2013 01:27:23 +0200 Bertrand Jacquin <[email protected]> wrote:
> 3.10-12/2300_USB-mount-extd-inq-cmd-fix.patch does not apply anymore
> as was included upstream at commit
> 0ac10bd036f0f3b8ce7ac2390446eab9531c72eb (v3.10.6-1-g0ac10bd)
Thank you very much for letting us know!
There is one subtle difference here; specifically, it does apply.
Unpacking source...
Unpacking linux-3.10.tar.xz
to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work
Unpacking genpatches-3.10-12.base.tar.xz
to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work/patches
Unpacking genpatches-3.10-12.extras.tar.xz
to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work/patches
* Applying 1000_linux-3.10.1.patch
(-p1) ... [ ok ]
* Applying 1001_linux-3.10.2.patch
(-p1) ... [ ok ]
* Applying 1002_linux-3.10.3.patch
(-p1) ... [ ok ]
* Applying 1003_linux-3.10.4.patch
(-p1) ... [ ok ]
* Applying 1004_linux-3.10.5.patch
(-p1) ... [ ok ]
* Applying 1005_linux-3.10.6.patch
(-p1) ... [ ok ]
* Applying 1006_linux-3.10.7.patch
(-p1) ... [ ok ]
* Applying 1500_XATTR_USER_PREFIX.patch
(-p1) ... [ ok ]
* Applying 1700_enable-thinkpad-micled.patch
(-p1) ... [ ok ]
* Applying
1801_block-cgroups-kconfig-build-bits-for-BFQ-v6r2-3.10.patch
(-p1) ... [ ok ]
* Applying 1802_block-introduce-the-BFQ-v6r2-I-O-sched-for-3.10.patch1
(-p1) ... [ ok ]
* Applying
1803_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v6r2-for-3.10.0.patch1
(-p1) ... [ ok ]
* Applying 2300_USB-mount-extd-inq-cmd-fix.patch
(-p1) ... [ ok ]
* Applying 2400_kcopy-patch-for-infiniband-driver.patch
(-p1) ... [ ok ]
* Applying 2700_ThinkPad-30-brightness-control-fix.patch
(-p1) ... [ ok ]
* Applying 2900_dev-root-proc-mount-fix.patch
(-p1) ... [ ok ]
* Applying 4200_fbcondecor-0.9.6.patch
(-p1) ... [ ok ]
* Applying 4500_nouveau-video-output-control-Kconfig.patch
(-p1) ... [ ok ]
* Applying 4567_distro-Gentoo-Kconfig.patch
(-p1) ... [ ok ]
Source unpacked
in /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work
Inspecting it I agree it does apply a bit weirdly; although, it does
make the intent of the code the same and should thus not be a problem.
if (sdev->skip_vpd_pages)
goto fail;
if (sdev->skip_vpd_pages)
goto fail;
Using =sys-devel/patch-2.7.1-r2 here. Why does it not apply for you?
Anyhow, just for safety reasons I'll push out a new genpatches; as it
intends to fix a build issue, it doesn't require a revision bump. :)
--
With kind regards,
Tom Wijsman (TomWij)
Gentoo Developer
E-mail address : [email protected]
GPG Public Key : 6D34E57D
GPG Fingerprint : C165 AF18 AB4C 400B C3D2 ABF0 95B2 1FCD 6D34 E57D
signature.asc
Description: PGP signature
