mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next: manual merge of the trivial tree with Linus' tree
Date: Tue, 26 Aug 2014 14:29:10 +1000	[thread overview]
Message-ID: <20140826142910.2e8c496e@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
mm/memcontrol.c between commit 747db954cab6 ("mm: memcontrol: use page
lists for uncharge batching") from Linus' tree and commit cc5ac3e15fa5
("mm: memcontrol: fix comment") from the trivial tree.

I fixed it up (the former removed the comment changed by the latter)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2014-08-26  4:29 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-26  4:29 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-05-06  3:52 Stephen Rothwell
2013-12-24  2:49 Stephen Rothwell
2013-07-03  5:29 Stephen Rothwell
2012-06-29  4:36 Stephen Rothwell
2012-06-29 12:48 ` Jiri Kosina
2012-04-04  2:03 Stephen Rothwell
2012-03-29  1:48 Stephen Rothwell
2011-02-28  4:21 Stephen Rothwell
2010-11-09  2:31 Stephen Rothwell
2010-11-15 12:40 ` Jiri Kosina
2010-08-10  2:11 Stephen Rothwell
2010-08-10 11:22 ` Jiri Kosina
2010-03-08  2:20 Stephen Rothwell
2010-03-08  2:41 ` Mulyadi Santosa

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=20140826142910.2e8c496e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=geert@linux-m68k.org \
    --cc=hannes@cmpxchg.org \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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
all inboxes | Powered by JetHome®