From: Ian Munsie <imunsie@au1•ibm.com>
To: "Winkler, Tomas" <tomas.winkler@intel•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Andrew Morton <akpm@linux-foundation•org>,
Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>
Subject: RE: linux-next: manual merge of the akpm-current tree with the char-misc tree
Date: Wed, 15 Jan 2014 12:57:36 +1100 [thread overview]
Message-ID: <1389750036-sup-8437@delenn.ozlabs.ibm.com> (raw)
In-Reply-To: <5B8DA87D05A7694D9FA63FD143655C1B1AF42F69@HASMSX106.ger.corp.intel.com>
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'
-Ian
next prev parent reply other threads:[~2014-01-15 1:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 4:51 linux-next: manual merge of the akpm-current tree with the char-misc tree Stephen Rothwell
2014-01-14 8:31 ` Winkler, Tomas
2014-01-15 1:57 ` Ian Munsie [this message]
2014-01-15 22:36 ` Winkler, Tomas
2014-01-15 23:52 ` Ian Munsie
-- strict thread matches above, loose matches on Subject: below --
2015-08-06 6:35 Stephen Rothwell
2015-08-06 21:12 ` Greg KH
2015-01-13 5:49 Stephen Rothwell
2014-01-10 4:36 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389750036-sup-8437@delenn.ozlabs.ibm.com \
--to=imunsie@au1$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tomas.winkler@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox