From: Theodore Ts'o <tytso@mit.edu>
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 random tree
Date: Tue, 1 Oct 2013 07:29:37 -0400 [thread overview]
Message-ID: <20131001112937.GC1994@thunk.org> (raw)
In-Reply-To: <1380625644-11331-6-git-send-email-treding@nvidia.com>
On Tue, Oct 01, 2013 at 01:07:22PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the random tree got a conflict in:
>
> init/main.c
>
> I fixed it up (see below). Please check if the resolution looks correct.
Looks good, thanks.
- Ted
>
> Thanks,
> Thierry
> ---
> diff --cc init/main.c
> index 7cc4b78,586cd33..379090f
> --- a/init/main.c
> +++ b/init/main.c
> @@@ -75,7 -75,7 +75,8 @@@
> #include <linux/blkdev.h>
> #include <linux/elevator.h>
> #include <linux/sched_clock.h>
> +#include <linux/context_tracking.h>
> + #include <linux/random.h>
>
> #include <asm/io.h>
> #include <asm/bugs.h>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
next prev parent reply other threads:[~2013-10-01 11:29 UTC|newest]
Thread overview: 18+ 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
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 [this message]
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-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding
2013-10-07 15:18 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-07 15:18 ` Thierry Reding
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the random tree Thierry Reding
2013-09-30 11:26 ` 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=20131001112937.GC1994@thunk.org \
--to=tytso@mit.edu \
--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.