public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Mark Brown <broonie@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the akpm-current tree with the  tree
Date: Mon, 1 Sep 2014 23:54:16 +0100	[thread overview]
Message-ID: <20140901235416.5181ece8487f3365511bbf93@kernel.org> (raw)

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

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in scripts/checkpatch.pl between commit 8678fa326053d41 ("checkpatch: relax check for length of git commit IDs") from Linus' tree and what looks like the same commit from the akpm-current tree.

I fixed it up by taking Linus' version and can carry as required.

Thanks,
Mark

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

next             reply	other threads:[~2014-09-01 22:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-01 22:54 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-12-03  0:23 linux-next: manual merge of the akpm-current tree with the tree Mark Brown
2015-01-21  7:14 Stephen Rothwell
2014-09-03 16:23 Mark Brown
2014-05-29  9:04 Stephen Rothwell
2013-02-22  3:46 Stephen Rothwell
2012-11-15  6:25 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=20140901235416.5181ece8487f3365511bbf93@kernel.org \
    --to=broonie@kernel$(echo .)org \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox