[3.5.y.z extended stable] Linux 3.5.7.7

Luis Henriques luis.henriques at canonical.com
Mon Mar 4 15:22:25 UTC 2013


Hi,

On Mon, Mar 04, 2013 at 02:41:23PM +0100, Arkadiusz Miśkiewicz wrote:
> On Monday 04 of March 2013, Luis Henriques wrote:
> > I am announcing the release of the 3.5.7.7 tree of stable patches.
> 
> Hm, diff from the git repo doesn't seem to apply to clean 3.5.7.
> 
> 3.5.7.6 was applying correctly with this method
> 
> [arekm at ixion-pld ~/1]$ tar xf linux-3.5.7.tar.xz 
> [arekm at ixion-pld ~/1]$ wget 'http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=commitdiff_plain;hp=v3.5.7;h=v3.5.7.7' -O out.patch
> --2013-03-04 14:38:17--  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=commitdiff_plain;hp=v3.5.7;h=v3.5.7.7
> Translacja kernel.ubuntu.com (kernel.ubuntu.com)... 91.189.94.216
> Łączenie się z kernel.ubuntu.com (kernel.ubuntu.com)|91.189.94.216|:80... połączono.
> Żądanie HTTP wysłano, oczekiwanie na odpowiedź... 200 OK
> Długość: nieznana [text/plain]
> Zapis do: `out.patch'
> 
>     [           <=>                                                                                                      ] 1.423.791    603KB/s   w  2,3s   
> 
> 2013-03-04 14:38:21 (603 KB/s) - zapisano `out.patch' [1423791]
> 
> [arekm at ixion-pld ~/1]$ cd linux-3.5.7 
> [arekm at ixion-pld ~/1/linux-3.5.7]$ patch -p1 < ../out.patch 
> patching file Documentation/cgroups/memory.txt
> patching file Documentation/devicetree/bindings/arm/atmel-at91.txt
> patching file Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt
> patching file Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt
> patching file Documentation/dvb/get_dvb_firmware
> patching file Documentation/hwmon/coretemp
> [...]
> patching file drivers/tty/tty_ioctl.c
> patching file drivers/tty/vt/vt.c
> Hunk #14 FAILED at 3677.
> 1 out of 14 hunks FAILED -- saving rejects to file drivers/tty/vt/vt.c.rej

It looks like at some point in the past a non-ascii character has been
introduced in the 3.5 stable tree (I haven't actually investigated
when/why, but probably a commit had this non-ascii character).

One commit in this release actually removes this non-ascii character and
the git patch generator doesn't handle these very well (take a look at
your out.patch and you'll see a funny character there).

So, unfortunately it looks like there's no solution other than manually
edit your patch to remove these non-ascii characters (or use a proper
git tree instead of the git web interface to generate the patch).

Cheers,
--
Luis




More information about the kernel-team mailing list