netdev - linux-next: manual merge of the net-next tree with the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130626130838.fb1e8f7cbe232d231a036bf8@canb.auug.org.au>
Date:	Wed, 26 Jun 2013 13:08:38 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Colin Cross <ccross@...roid.com>,
	"Rafael J. Wysocki" <rjw@...k.pl>,
	Eliezer Tamir <eliezer.tamir@...ux.intel.com>
Subject: linux-next: manual merge of the net-next tree with the pm tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
fs/select.c between commit 9745cdb36da8 ("select: use freezable blocking
call") from the pm tree and commit 2d48d67fa8cd ("net: poll/select low
latency socket support") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc fs/select.c
index 6b14dc7,79b876e..0000000
--- a/fs/select.c
+++ b/fs/select.c
@@@ -27,7 -27,7 +27,8 @@@
  #include <linux/rcupdate.h>
  #include <linux/hrtimer.h>
  #include <linux/sched/rt.h>
 +#include <linux/freezer.h>
+ #include <net/ll_poll.h>
  
  #include <asm/uaccess.h>
  

Content of type "application/pgp-signature" skipped