From: "Jörn Engel" <joern@logfs.org>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the bcon tree
Date: Tue, 1 Oct 2013 10:26:55 -0400 [thread overview]
Message-ID: <20131001142655.GA29919@logfs.org> (raw)
In-Reply-To: <1380625644-11331-1-git-send-email-treding@nvidia.com>
On Tue, 1 October 2013 13:07:17 +0200, Thierry Reding wrote:
>
> Today's linux-next merge of the bcon tree got conflicts in:
>
> drivers/block/Kconfig
> kernel/printk.c
>
> I fixed them up (see below). Please check if the resolution looks correct.
I think for the moment you can drop the bcon tree. I have plans to
get it merged into mainline eventually, but currently lack time to
spend on it. In other words, it isn't really -next material.
Jörn
--
Doubt is not a pleasant condition, but certainty is an absurd one.
-- Voltaire
next prev parent reply other threads:[~2013-10-01 15:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the bcon tree Thierry Reding
2013-10-01 14:26 ` Jörn Engel [this message]
2013-10-01 11:07 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the cgroup tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the driver-core tree Thierry Reding
2013-10-01 13:54 ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-01 11:07 ` Thierry Reding
2013-10-01 11:29 ` Theodore Ts'o
2013-10-01 11:07 ` linux-next: manual merge of the sh tree Thierry Reding
2013-10-01 13:53 ` Greg Kroah-Hartman
2013-10-01 11:07 ` linux-next: manual merge of the vfs tree Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
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=20131001142655.GA29919@logfs.org \
--to=joern@logfs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thierry.reding@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.