diff mbox

linux-next: manual merge of the bkl-llseek tree with the wireless tree

Message ID 20101023142312.533f6a42.sfr@canb.auug.org.au
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Stephen Rothwell Oct. 23, 2010, 3:23 a.m. UTC 
Hi John, Dave,

On Mon, 18 Oct 2010 17:35:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the bkl-llseek tree got a conflict in
> drivers/net/wireless/ath/ath9k/debug.c between commit
> 772d5515635fef5bc7a9d0efee785b58b0181ee5 ("ath9k: make rate control
> debugfs stats per station") from the wireless tree and commit
> 6038f373a3dc1f1c26496e60b6c40b164716f07e ("llseek: automatically
> add .llseek fop") from the bkl-llseek tree.
> 
> The former moved some of the code modified by the latter to another file.
> 
> I added this merge fix patch:

This patch (reproduced below) will now be needed if the wireless or net
tree is merged with Linus' tree.  I also think I have missed a similar
needed fix in drivers/net/wireless/ath/ath5k/debug.c ...
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 0cee90c..e4c1ea3 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1582,7 +1582,8 @@  static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,
 static const struct file_operations fops_rcstat = {
 	.read = read_file_rcstat,
 	.open = ath9k_debugfs_open,
-	.owner = THIS_MODULE
+	.owner = THIS_MODULE,
+	.llseek = default_llseek,
 };
 
 static void ath_rate_add_sta_debugfs(void *priv, void *priv_sta,