From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>, Michal Marek <mmarek@suse.cz>,
Josh Triplett <josh@joshtriplett.org>
Subject: linux-next: manual merge of the akpm-current tree with the kbuild tree
Date: Thu, 7 Nov 2013 17:37:49 +1100 [thread overview]
Message-ID: <20131107173749.020fb3e03248c6b3227fe642@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
scripts/bloat-o-meter between commit 21cf6e584ce3 ("kbuild,
bloat-o-meter: fix static detection") from the kbuild tree and commit
372dd3b27736 ("scripts/bloat-o-meter: ignore changes in the size of
linux_banner") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc scripts/bloat-o-meter
index 855198c9dedb,31c953195b52..000000000000
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@@ -19,9 -19,10 +19,10 @@@ def getsizes(file)
size, type, name = l[:-1].split()
if type in "tTdDbBrR":
# strip generated symbols
- if name[:6] == "__mod_": continue
+ if name.startswith("__mod_"): continue
+ if name == "linux_banner": continue
- # function names begin with '.' on 64-bit powerpc
- if "." in name[1:]: name = "static." + name.split(".")[0]
+ # statics and some other optimizations adds random .NUMBER
+ name = re.sub(r'\.[0-9]+', '', name)
sym[name] = sym.get(name, 0) + int(size, 16)
return sym
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-11-07 6:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 6:37 Stephen Rothwell [this message]
2013-11-07 9:49 ` linux-next: manual merge of the akpm-current tree with the kbuild tree Michal Marek
2016-01-06 6:54 Stephen Rothwell
2016-01-06 8:07 ` Michal Marek
2017-11-02 7:13 Stephen Rothwell
2018-08-03 8:36 Stephen Rothwell
2018-08-15 23:55 ` Stephen Rothwell
2020-05-11 8:23 Stephen Rothwell
2021-04-08 10:34 Stephen Rothwell
2021-04-08 10: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=20131107173749.020fb3e03248c6b3227fe642@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mmarek@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).