linux-kernel - linux-next: manual merge of the wireless tree with Linus' 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20120104124020.5b481be704bd0040219ee0e0@canb.auug.org.au>
Date:	Wed, 4 Jan 2012 12:40:20 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Gortmaker <paul.gortmaker@...driver.com>
Subject: linux-next: manual merge of the wireless tree with Linus' tree

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c between commit 9d9779e723a5
("drivers/net: Add module.h to drivers who were implicitly using it")
from the  tree and commit e97173c985c0 ("rtl8192cu: Fix WARNING on
suspend/resume") from the wireless tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index c244f2f,a48bea6..0000000
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@@ -42,7 -42,8 +42,9 @@@
  #include "led.h"
  #include "hw.h"
  #include <linux/vmalloc.h>
 +#include <linux/module.h>
+ #include <linux/atomic.h>
+ #include <linux/types.h>
  
  MODULE_AUTHOR("Georgia		<georgia@...ltek.com>");
  MODULE_AUTHOR("Ziv Huang	<ziv_huang@...ltek.com>");

Content of type "application/pgp-signature" skipped