Date: Thu, 30 Jul 2015 20:13:51 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Larry Rosenman <ler@lerctr.org> Cc: Benno Rice <benno@freebsd.org>, freebsd-current@freebsd.org Subject: Re: pmspcv panic on boot on this box Message-ID: <20150730201351.GH90754@FreeBSD.org> In-Reply-To: <e510aec2b8d394cccf166ecabcad9785@thebighonker.lerctr.org> References: <20150728210109.GA6424@oldtbh.lerctr.org> <04E640B9-423C-4C30-BF90-D3DD148C930D@FreeBSD.org> <765D2BB8-F101-4D8C-BF1D-BB896904FB29@FreeBSD.org> <e510aec2b8d394cccf166ecabcad9785@thebighonker.lerctr.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--/8E7gjuj425jZz9t
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Thu, Jul 30, 2015 at 03:09:30PM -0500, Larry Rosenman wrote:
> $ sudo -s
> Password:
> # cd /usr/src
> # patch -p0 < ~ler/pmspcv.diff
> Hmm... Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/dev/pms/freebsd/driver/common/lxutil.c
> |===================================================================
> |--- sys/dev/pms/freebsd/driver/common/lxutil.c (revision 286083)
> |+++ sys/dev/pms/freebsd/driver/common/lxutil.c (working copy)
> --------------------------
> Patching file sys/dev/pms/freebsd/driver/common/lxutil.c using Plan A...
> Hunk #1 failed at 758.
> Hunk #2 failed at 767.
> 2 out of 2 hunks failed--saving rejects to
> sys/dev/pms/freebsd/driver/common/lxutil.c.rej
> done
> # vi sys/dev/pms/freebsd/driver/common/lxutil.c.rej
> @@ -758,6 +758,7 @@
> int idx;^M
> static U32 cardMap[4] = { 0, 0, 0, 0 };^M
Hmm. Somehow you ended up with MS DOS EOL...
I'm able to apply the patch without issues. Try this:
vi pmspcv.diff
:%s:[ctrl-m]::g
It should apply afterward.
Glen
--/8E7gjuj425jZz9t
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJVuoV5AAoJEAMUWKVHj+KT588P/iRaW6VzmHYDrthvAMBUcWvS
go1GwlkMZDNFT31WAFnRJJU20UAAfYrvJFXj8rEXFPF+ElRkVYH/VZMCId4+zVjL
x4sEkb8diBCb7703ClluINxstF+Wh5reZdlkWaQdm2V5lBvU1kNeUEq6XrLJN1XJ
FMn8L5bRbWvho5+/jgohBQ4kWAO1CSiaeKlSDrT9uu2GVzpLqIf4XuLjBViiCfCe
zMFgpuyfX7cClhxcf1UBF1d9fNSYGVmby3V0XNqlFPCBjzo9Vg2WiQQQxpmtcJEW
hicOUKOmSP1861J2Xav94bheTxplFIM017slX+nuNyXXawNriIGWkEnHarXQquZ2
btDNAqvdZMNrunCSf9DzVWqoqAhGT0s00fMVqNFreO4uXT0ojhYBI098qlWH0OpY
kRq+lmtPDd1z+KG0ySbWGbuIfcqyx/NzqhK/U/YUNMuOvoxkSHD3I6kbkab4xDgR
GdrxxpHkECK0svVY0o9ODSGYi0TwHwPzL+RhbSWUKeZtzBGj2QZQhRYN0VRSt7+v
KJesaQDiMwG/2jj5KQc3WgskD7yZayaBsrKxAXPKFDmFoYwjwyuneMjfMN3flFfx
LVLywjf66Ylv85b44CQ5E5xNTndZi5s8iikqNINLn7ieNH7ihY8n3i/Wcc4OH+7z
1haEMtzklSxHt5+gI810
=kPS9
-----END PGP SIGNATURE-----
--/8E7gjuj425jZz9t--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150730201351.GH90754>