Date: Mon, 13 Jul 2015 14:44:01 +0100 From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: freebsd-fs@freebsd.org Subject: Re: FreeBSD 10.1 Memory Exhaustion Message-ID: <55A3C0A1.7040505@infracaninophile.co.uk> In-Reply-To: <55A3A800.5060904@denninger.net> References: <CAB2_NwCngPqFH4q-YZk00RO_aVF9JraeSsVX3xS0z5EV3YGa1Q@mail.gmail.com> <55A3A800.5060904@denninger.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Bi5uDFNfv6uhNo3bRv1e3b7FJh05FUkAC Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 2015/07/13 12:58, Karl Denninger wrote: > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D187594 >=20 > The 2015-02-10 refactor will apply against 10.1-STABLE and 10.2-PRE (th= e > latter will give you a 10-line fuzz in one block but applies and works.= ) Is there a version that will apply to releng/10.1 ? I'm getting: backup-4:/usr/src/sys:# svn patch ~matthew/patch.10-1.STABLE C cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c > applied hunk @@ -190,6 +190,15 @@ with offset -1 > applied hunk @@ -2697,11 +2718,29 @@ with offset -97 > applied hunk @@ -2889,6 +2928,19 @@ with offset -54 > rejected hunk @@ -212,7 +221,7 @@ > rejected hunk @@ -233,7 +242,9 @@ > rejected hunk @@ -2635,6 +2646,28 @@ > rejected hunk @@ -2666,19 +2699,7 @@ U cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c > applied hunk @@ -1058,7 +1060,7 @@ with offset -10 > applied hunk @@ -1070,11 +1072,11 @@ with offset -10 > applied hunk @@ -1279,6 +1281,7 @@ with offset -10 > applied hunk @@ -1291,6 +1294,42 @@ with offset -10 > applied hunk @@ -1321,7 +1360,7 @@ with offset -10 U cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c > applied hunk @@ -547,7 +550,7 @@ with offset -20 > applied hunk @@ -726,7 +729,7 @@ with offset -20 U cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h Summary of conflicts: Text conflicts: 1 If not, I'll just put this box onto STABLE/10. Cheers, Matthew --Bi5uDFNfv6uhNo3bRv1e3b7FJh05FUkAC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQJ8BAEBCgBmBQJVo8CnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxOUYxNTRFQ0JGMTEyRTUwNTQ0RTNGMzAw MDUxM0YxMEUwQTlFNEU3AAoJEABRPxDgqeTnvxUP/iMtRyZVjHrBNul7cNq5km3P rY3H16MdNabQ1DYLuBDdycOwizQ02ki2vFkAijsWDebAN8W9L3hP8fcisPBdxlUd AUjh020Jltjg/pF5340FO9mmZeMDaVKylyA8v+UwC2qdgD6IJjflHTAGKyLseETx Hwx5g2CNqMGAF+47mJ+tcJgQEyP+Y97lRVui3tUIVek9YjXp0332BG86mTQhWR0R XdcWiRdVqo2UszJWxhgP/zxpckaxTSyG+Tb1vpYVFZKVk2D4AVIHepqy91CUBOZ4 AgARMVtWFKN+Ul1TZCKppnL43HtUGgN1pTTDRcNnoqkBamAMSzwa1zzeEjYqLKRw v+4ZSThWjzlTS0XVPDZo7ZgADJ3Zy9DotrE29kGAbuiJCXMb4Xe27p+PJu3vaYCf 1Bs2mroUnBqDSxq0QJE+Xr4sc/fE0YOUT3cdDvIXdqlTGryXRXJYRROyo4qcfn8b mCElPbx2jelvI00rxJtdsFWfvDxe12iGYUd80Trod93epqLoUj6CJfXWYDEVrjCc wHiCXdRsisa7vNTQgVclhST5U8Lnskt0t/TgZpBZjVkn4gLrgETEGHlD7X0sVSW+ MXx5z8Z0KJTy2uu8DDufrRJ43Dbg7FMJun/vvKGiH48njPBOtmotkQUgwitaHWfj lRyyWfePFNUNWxKNPbFR =BLs+ -----END PGP SIGNATURE----- --Bi5uDFNfv6uhNo3bRv1e3b7FJh05FUkAC--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55A3C0A1.7040505>