linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"H. Peter Anvin" <hpa@zytor.com>, "Michal Marek" <mmarek@suse.cz>,
	"\"Dagfinn Ilmari Mannsåker\"" <ilmari@ilmari.org>
Subject: linux-next: manual merge of the akpm tree with the kbuild tree
Date: Mon, 18 Feb 2013 16:52:32 +1100	[thread overview]
Message-ID: <20130218165232.92004590a089f22f67127db9@canb.auug.org.au> (raw)

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/timeconst.pl between commit 70730bca1331 ("kernel: Replace
timeconst.pl with a bc script") from the kbuild tree and commit
"timeconst.pl: remove deprecated defined(@array)" from the akpm tree.

I just dropped the akpm tree patch since the file had been deleted by the
kbuild tree commit.

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

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

             reply	other threads:[~2013-02-18  5:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-18  5:52 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-01-22  4:02 linux-next: manual merge of the akpm tree with the kbuild tree Stephen Rothwell
2019-01-22  5:30 ` Masahiro Yamada
2017-07-10  5:30 Stephen Rothwell
2013-07-04  4:33 Stephen Rothwell
2013-07-04  4:43 ` Andrew Morton
2013-07-04  9:07   ` Michal Marek
2013-01-14  3:49 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=20130218165232.92004590a089f22f67127db9@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=ilmari@ilmari.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mmarek@suse.cz \
    /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).