From: Michal Marek <mmarek@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>,
Josh Triplett <josh@joshtriplett.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the kbuild tree
Date: Thu, 07 Nov 2013 10:49:00 +0100 [thread overview]
Message-ID: <527B620C.1090801@suse.cz> (raw)
In-Reply-To: <20131107173749.020fb3e03248c6b3227fe642@canb.auug.org.au>
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
next prev parent reply other threads:[~2013-11-07 9:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 6:37 linux-next: manual merge of the akpm-current tree with the kbuild tree Stephen Rothwell
2013-11-07 9:49 ` Michal Marek [this message]
-- strict thread matches above, loose matches on Subject: below --
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=527B620C.1090801@suse.cz \
--to=mmarek@suse.cz \
--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=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.