netdev - linux-next: manual merge of the wireless-next tree with the net-next 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: <20130604123347.df8639ba69cb914069c80fd6@canb.auug.org.au>
Date:	Tue, 4 Jun 2013 12:33:47 +1000
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,
	Sujith Manoharan <c_manoha@....qualcomm.com>,
	Jingoo Han <jg1.han@...sung.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 net-next tree

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/debug.c between commit 27d7f47756f4 ("net:
wireless: replace strict_strtoul() with kstrtoul()") from the net-next
tree and commit 6e4d291eec82 ("ath9k: Print ANI statistics in debugfs")
from the wireless-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 drivers/net/wireless/ath/ath9k/debug.c
index 51cc0fa,7852f6e..0000000
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@@ -200,12 -244,15 +244,15 @@@ static ssize_t write_file_ani(struct fi
  		return -EFAULT;
  
  	buf[len] = '\0';
- 	if (kstrtoul(buf, 0, &disable_ani))
 -	if (strict_strtoul(buf, 0, &ani))
++	if (kstrtoul(buf, 0, &ani))
  		return -EINVAL;
  
- 	common->disable_ani = !!disable_ani;
+ 	if (ani < 0 || ani > 1)
+ 		return -EINVAL;
+ 
+ 	common->disable_ani = !ani;
  
- 	if (disable_ani) {
+ 	if (common->disable_ani) {
  		clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
  		ath_stop_ani(sc);
  	} else {

Content of type "application/pgp-signature" skipped