From: James Hogan <james.hogan@imgtec•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Rusty Russell <rusty@rustcorp•com.au>,
Mel Gorman <mgorman@suse•de>,
Andrew Morton <akpm@linux-foundation•org>
Subject: Re: linux-next: manual merge of the metag tree with Linus' tree
Date: Mon, 25 Feb 2013 09:50:31 +0000 [thread overview]
Message-ID: <512B33E7.5010300@imgtec.com> (raw)
In-Reply-To: <20130225094830.e45f7b56cddcc839841d6619@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
On 24/02/13 22:48, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the metag tree got a conflict in
> mm/page_alloc.c between commit 22b751c3d037 ("mm: rename page struct
> field helpers") from Linus' tree and commit 373d4d099761 ("taint: add
> explicit flag to show whether lock dep is still OK") from the metag tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Hi Stephen,
Looks good to me.
Thanks
James
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-02-25 9:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-24 22:48 linux-next: manual merge of the metag tree with Linus' tree Stephen Rothwell
2013-02-25 9:50 ` James Hogan [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-05-02 23:19 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=512B33E7.5010300@imgtec.com \
--to=james.hogan@imgtec$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mgorman@suse$(echo .)de \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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