RE: linux-next: manual merge of the akpm-current tree with thechar-misc tree

[Winkler, Tomas]

> -----Original Message-----
> From: Ian Munsie [mailto:imunsie@xxxxxxxxxxx]
> Sent: Wednesday, January 15, 2014 03:58
> To: Winkler, Tomas
> Cc: Stephen Rothwell; Andrew Morton; Greg KH; Arnd Bergmann; linux-
> next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Subject: RE: linux-next: manual merge of the akpm-current tree with the char-
> misc tree
> 
> Excerpts from Winkler, Tomas's message of 2014-01-14 19:31:26 +1100:
> > > Today's linux-next merge of the akpm-current tree got a conflict in
> > > drivers/misc/mei/init.c between commit 33ec08263147 ("mei: revamp mei
> > > reset state machine") from the char-misc tree and commit dd045dab2999
> > > ("drivers/misc/mei: ratelimit several error messages") from the
> > > akpm-current tree.
> > >
> > > I fixed it up (see below) and can carry the fix as necessary (no action
> > > is required).
> >
> > Can we just drop this rete limit stuff, I've never asked that.
> > Tomas
> 
> Hi Tomas,
> 
> So far the problem has only been a one off thing for me, so it would
> seem that whatever circumstances contributed to it are fairly rare, but
> unless the underlying issue has been identified and fixed I would not
> recommend just dropping the patch. When it did hit I ended up with my
> log files (kern.log, syslog & messages) filled up with 15GB of the
> messages mentioned in the commit message within minutes, until my hard
> drive ran out of space bringing my system down.
> 
> Even if the underlying issue is fixed I do not see any advantage in
> dropping the rate limit patch - it is an absolutely trivial* patch, and
> if anything I would expand it to cover all the error messages in the
> driver, not just the three involved in that particular case.
> 
> * It's essentially: sed 's/dev_\(warn\|err\)\>/dev_\1_ratelimited/g'
> 

I think the issue was fixed and also then number  of consecutive resets were limited to 3 so you should
not see this issue anymore in the next release, your patch just conflicted with these fixes. 
Still need to provide a simpler fix for the stable kernel.

Thanks
Tomas
¢éì®&Þ~º&¶¬–+-±éÝ¥Šw®žË±Êâmébžìdz¹Þ)í…æèw*jg¬±¨¶‰šŽŠÝj/êäz¹ÞŠà2ŠÞ¨è­Ú&¢)ß«a¶Úþø®G«éh®æj:+v‰¨Šwè†Ù>Wš±êÞiÛaxPjØm¶ŸÿÃ-»+ƒùdš_