Date: Mon, 13 Jul 2015 08:55:35 -0500 From: Karl Denninger <karl@denninger.net> To: freebsd-fs@freebsd.org Subject: Re: FreeBSD 10.1 Memory Exhaustion Message-ID: <55A3C357.5070209@denninger.net> In-Reply-To: <55A3C0A1.7040505@infracaninophile.co.uk> References: <CAB2_NwCngPqFH4q-YZk00RO_aVF9JraeSsVX3xS0z5EV3YGa1Q@mail.gmail.com> <55A3A800.5060904@denninger.net> <55A3C0A1.7040505@infracaninophile.co.uk>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] The previous version of the patch MAY apply against RELENG/10.1. On 7/13/2015 08:44, Matthew Seaman wrote: > On 2015/07/13 12:58, Karl Denninger wrote: >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=187594 >> >> The 2015-02-10 refactor will apply against 10.1-STABLE and 10.2-PRE (the >> 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 > > > -- Karl Denninger karl@denninger.net <mailto:karl@denninger.net> /The Market Ticker/ /[S/MIME encrypted email preferred]/ [-- Attachment #2 --] 0 *H 01 0 + 0 *H _0[0C)0 *H 01 0 UUS10UFlorida10U Niceville10U Cuda Systems LLC1 0UCuda Systems LLC CA1"0 *H Cuda Systems LLC CA0 150421022159Z 200419022159Z0Z1 0 UUS10UFlorida10U Cuda Systems LLC1 0 UKarl Denninger (OCSP)0"0 *H 0 X@vkY Tq/vE]5#֯MX \8LJ/V?5Da+ sJc*/r{ȼnS+ w")ąZ^DtdCOZ ~7Q '@a#ijc۴oZdB&!Ӝ-< ? HN5y 5}F|e f"V لio74zn">a1qWuɖbFeGE&3(KhixG3!#e_XƬ Ϝ/,$+;4y 'Bz<qT9_?rRUpn5 Jn&Rx/p Jyel*pN8/#9u/YP EC)TY>~/˘N[vyiDKˉ ,^" ?$T8 v& K%z8C @?K{9f`+@,| Mbia 007++0)0'+0http://cudasystems.net:88880 U 0 0 `HB0 U 0, `HB OpenSSL Generated Certificate0 U -h\Ff Y0 U #0$q}ݽʒm50 U 0karl@denninger.net0 *H Owbabɺx&Uk[ (Oj!%p MQ0I!#QH}.>~2&D}<wm_>V6 v ]f>=Nn+8;q wfΰ/RLyUG#b}n!Dր _up|_ǰc/%ۥ nN8:d;-UJd/m1~VނיnN I˾$tF1&}|?q?\đXԑ&\4V<lKۮ3%Am_(q -(cAeGX)f}-˥6cv~Kg8m~v ;|9:-iAPқ6ېn-.)<[$KJtt/L4ᖣ^Cmu4vb{+BG$M0c\[MR|0FԸP&78"4p# }D Z9;V9#>Sw"[UP710001 0 UUS10UFlorida10U Niceville10U Cuda Systems LLC1 0UCuda Systems LLC CA1"0 *H Cuda Systems LLC CA)0 + !0 *H 1 *H 0 *H 1 150713135535Z0# *H 1@-=rD Ka0l *H 1_0]0 `He*0 `He0 *H 0*H 0 *H @0+0 *H (0 +71001 0 UUS10UFlorida10U Niceville10U Cuda Systems LLC1 0UCuda Systems LLC CA1"0 *H Cuda Systems LLC CA)0 *H 101 0 UUS10UFlorida10U Niceville10U Cuda Systems LLC1 0UCuda Systems LLC CA1"0 *H Cuda Systems LLC CA)0 *H I?"Eٵ a)ty`/Ш_9.33qEi^KqT804C.,-j ms|K6}D-3]HN[SQ[,3&G idKjY7S̍m`"c! /8ݳР (vw23.`>kiU \IKv)AJcb i/|rO)8h4l5~_ Ĩ":]$k _Ϧѯ@(ݳ eeJz Q/6^e稆 rO9~5=BZ9 ifbb - P] #G |3yNTn騍ZJui"bTU&OpԄaDQ|b,u }D7ـ@ H79dg*(6b \4bR+,T/EKw0gQ^87R?(G#yDw@help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55A3C357.5070209>