1 |
On Fri, 16 Aug 2013 01:27:23 +0200 |
2 |
Bertrand Jacquin <beber@××××××××.net> wrote: |
3 |
|
4 |
> 3.10-12/2300_USB-mount-extd-inq-cmd-fix.patch does not apply anymore |
5 |
> as was included upstream at commit |
6 |
> 0ac10bd036f0f3b8ce7ac2390446eab9531c72eb (v3.10.6-1-g0ac10bd) |
7 |
|
8 |
Thank you very much for letting us know! |
9 |
|
10 |
There is one subtle difference here; specifically, it does apply. |
11 |
|
12 |
|
13 |
Unpacking source... |
14 |
Unpacking linux-3.10.tar.xz |
15 |
to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work |
16 |
Unpacking genpatches-3.10-12.base.tar.xz |
17 |
to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work/patches |
18 |
Unpacking genpatches-3.10-12.extras.tar.xz |
19 |
to /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work/patches |
20 |
* Applying 1000_linux-3.10.1.patch |
21 |
(-p1) ... [ ok ] |
22 |
* Applying 1001_linux-3.10.2.patch |
23 |
(-p1) ... [ ok ] |
24 |
* Applying 1002_linux-3.10.3.patch |
25 |
(-p1) ... [ ok ] |
26 |
* Applying 1003_linux-3.10.4.patch |
27 |
(-p1) ... [ ok ] |
28 |
* Applying 1004_linux-3.10.5.patch |
29 |
(-p1) ... [ ok ] |
30 |
* Applying 1005_linux-3.10.6.patch |
31 |
(-p1) ... [ ok ] |
32 |
* Applying 1006_linux-3.10.7.patch |
33 |
(-p1) ... [ ok ] |
34 |
* Applying 1500_XATTR_USER_PREFIX.patch |
35 |
(-p1) ... [ ok ] |
36 |
* Applying 1700_enable-thinkpad-micled.patch |
37 |
(-p1) ... [ ok ] |
38 |
* Applying |
39 |
1801_block-cgroups-kconfig-build-bits-for-BFQ-v6r2-3.10.patch |
40 |
(-p1) ... [ ok ] |
41 |
* Applying 1802_block-introduce-the-BFQ-v6r2-I-O-sched-for-3.10.patch1 |
42 |
(-p1) ... [ ok ] |
43 |
* Applying |
44 |
1803_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v6r2-for-3.10.0.patch1 |
45 |
(-p1) ... [ ok ] |
46 |
* Applying 2300_USB-mount-extd-inq-cmd-fix.patch |
47 |
(-p1) ... [ ok ] |
48 |
* Applying 2400_kcopy-patch-for-infiniband-driver.patch |
49 |
(-p1) ... [ ok ] |
50 |
* Applying 2700_ThinkPad-30-brightness-control-fix.patch |
51 |
(-p1) ... [ ok ] |
52 |
* Applying 2900_dev-root-proc-mount-fix.patch |
53 |
(-p1) ... [ ok ] |
54 |
* Applying 4200_fbcondecor-0.9.6.patch |
55 |
(-p1) ... [ ok ] |
56 |
* Applying 4500_nouveau-video-output-control-Kconfig.patch |
57 |
(-p1) ... [ ok ] |
58 |
* Applying 4567_distro-Gentoo-Kconfig.patch |
59 |
(-p1) ... [ ok ] |
60 |
Source unpacked |
61 |
in /var/tmp/portage/sys-kernel/gentoo-sources-3.10.7/work |
62 |
|
63 |
|
64 |
Inspecting it I agree it does apply a bit weirdly; although, it does |
65 |
make the intent of the code the same and should thus not be a problem. |
66 |
|
67 |
if (sdev->skip_vpd_pages) |
68 |
goto fail; |
69 |
|
70 |
if (sdev->skip_vpd_pages) |
71 |
goto fail; |
72 |
|
73 |
Using =sys-devel/patch-2.7.1-r2 here. Why does it not apply for you? |
74 |
|
75 |
Anyhow, just for safety reasons I'll push out a new genpatches; as it |
76 |
intends to fix a build issue, it doesn't require a revision bump. :) |
77 |
|
78 |
-- |
79 |
With kind regards, |
80 |
|
81 |
Tom Wijsman (TomWij) |
82 |
Gentoo Developer |
83 |
|
84 |
E-mail address : TomWij@g.o |
85 |
GPG Public Key : 6D34E57D |
86 |
GPG Fingerprint : C165 AF18 AB4C 400B C3D2 ABF0 95B2 1FCD 6D34 E57D |