[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <527B620C.1090801@suse.cz>
Date: Thu, 07 Nov 2013 10:49:00 +0100
From: Michal Marek <mmarek@...e.cz>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Andi Kleen <ak@...ux.intel.com>,
Josh Triplett <josh@...htriplett.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the kbuild
tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists