From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Yaakov Selkowitz <yselkowitz@users.sourceforge.net>,
Michal Marek <mmarek@suse.cz>, Daniel Tang <dt.tangr@gmail.com>
Subject: Re: linux-next: manual merge of the akpm tree with the kbuild tree
Date: Wed, 3 Jul 2013 21:43:00 -0700 [thread overview]
Message-ID: <20130703214300.11d9223a.akpm@linux-foundation.org> (raw)
In-Reply-To: <20130704143353.e695ca64b17705c842676870@canb.auug.org.au>
On Thu, 4 Jul 2013 14:33:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got conflicts in
> tools/include/tools/be_byteshift.h and tools/include/tools/le_byteshift.h
> between commit b35310627f39 ("tools/include: use stdint types for
> user-space byteshift headers") from the kbuild tree and commit
> "scripts/sortextable.c: fix building on non-Linux systems" from the
> akpm tree.
>
> As fas as I can tell, these patches do the same thing except one uses
> stdint.h and the other inttypes.h. I just dropped the akpm tree patch.
Well OK, but new patches really shouldn't be popping up in the middle
of the merge window like this.
AFAICT Yaakov (re)sent this patch way back in April, so it should have
been in -next for a long time. Something has gone wrong here.
next prev parent reply other threads:[~2013-07-04 4:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 4:33 linux-next: manual merge of the akpm tree with the kbuild tree Stephen Rothwell
2013-07-04 4:43 ` Andrew Morton [this message]
2013-07-04 9:07 ` Michal Marek
-- strict thread matches above, loose matches on Subject: below --
2019-01-22 4:02 Stephen Rothwell
2019-01-22 5:30 ` Masahiro Yamada
2017-07-10 5:30 Stephen Rothwell
2013-02-18 5:52 Stephen Rothwell
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=20130703214300.11d9223a.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=dt.tangr@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=sfr@canb.auug.org.au \
--cc=yselkowitz@users.sourceforge.net \
/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