From: Michal Marek <mmarek@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the kbuild tree
Date: Wed, 6 Jan 2016 09:07:30 +0100 [thread overview]
Message-ID: <568CCB42.7090203@suse.cz> (raw)
In-Reply-To: <20160106175423.07e00c12@canb.auug.org.au>
On 2016-01-06 07:54, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> scripts/tags.sh
>
> between commit:
>
> 93209d65c1d3 ("tags: Unify emacs and exuberant rules")
>
> from the kbuild tree and commit:
>
> ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
That's correct, thanks.
Michal
next prev parent reply other threads:[~2016-01-06 8:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-06 6:54 linux-next: manual merge of the akpm-current tree with the kbuild tree Stephen Rothwell
2016-01-06 8:07 ` Michal Marek [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-08 10:34 Stephen Rothwell
2021-04-08 10:36 ` Stephen Rothwell
2020-05-11 8:23 Stephen Rothwell
2018-08-03 8:36 Stephen Rothwell
2018-08-15 23:55 ` Stephen Rothwell
2017-11-02 7:13 Stephen Rothwell
2013-11-07 6:37 Stephen Rothwell
2013-11-07 9:49 ` Michal Marek
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=568CCB42.7090203@suse.cz \
--to=mmarek@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=kirill.shutemov@linux.intel.com \
--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 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).