linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the random tree
Date: Mon,  7 Oct 2013 17:18:46 +0200	[thread overview]
Message-ID: <1381159127-11067-4-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381159127-11067-1-git-send-email-treding@nvidia.com>

Today's linux-next merge of the random tree got a conflict in:

	drivers/char/random.c

caused by commits 5573604 (random: push extra entropy to the output pools)
and 0244ad0 (Remove GENERIC_HARDIRQ config option). I fixed it up (see
below). Please verify that the resolution looks correct.

Thanks,
Thierry
---
diff --cc drivers/char/random.c
index 7737b5b,f126bd2..7cfc146
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@@ -255,8 -255,12 +255,9 @@@
  #include <linux/fips.h>
  #include <linux/ptrace.h>
  #include <linux/kmemcheck.h>
 +#include <linux/irq.h>
+ #include <linux/workqueue.h>
  
 -#ifdef CONFIG_GENERIC_HARDIRQS
 -# include <linux/irq.h>
 -#endif
 -
  #include <asm/processor.h>
  #include <asm/uaccess.h>
  #include <asm/irq.h>

  parent reply	other threads:[~2013-10-07 15:20 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding
2013-10-07 15:18 ` linux-next: build failure after merge of the mips tree Thierry Reding
2013-10-07 15:18 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-07 15:18 ` Thierry Reding [this message]
2013-10-07 15:18 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-10-07 15:48   ` Larry Finger
2013-10-07 15:56     ` Joe Perches
2013-10-07 16:09       ` Larry Finger
2013-10-07 16:17         ` Joe Perches
2013-10-07 17:16           ` Larry Finger
  -- strict thread matches above, loose matches on Subject: below --
2013-10-01 11:03 linux-next: Tree for Oct 1 Thierry Reding
2013-10-01 11:07 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-01 11:29   ` Theodore Ts'o
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

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=1381159127-11067-4-git-send-email-treding@nvidia.com \
    --to=thierry.reding@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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).