linux-next: manual merge of the akpm-current tree with the kbuild tree

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
  

On 7.11.2013 07:37, Stephen Rothwell wrote:

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).

I sucked the bloat-o-meter fixes into the kbuild tree.

Michal