From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"John W. Linville" <linville@tuxdriver•com>,
Felix Fietkau <nbd@openwrt•org>
Subject: linux-next: manual merge of the bkl-llseek tree with the wireless tree
Date: Mon, 18 Oct 2010 17:35:43 +1100 [thread overview]
Message-ID: <20101018173543.c33530e9.sfr@canb.auug.org.au> (raw)
Hi Arnd,
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:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 18 Oct 2010 17:33:25 +1100
Subject: [PATCH] ath9k: fix up for .llseek fop change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/net/wireless/ath/ath9k/rc.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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,
--
1.7.1
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next reply other threads:[~2010-10-18 6:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-18 6:35 Stephen Rothwell [this message]
2010-10-23 3:23 ` linux-next: manual merge of the bkl-llseek tree with the wireless tree Stephen Rothwell
2010-10-23 9:27 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2010-11-19 4:50 Tomoki Sekiyama
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=20101018173543.c33530e9.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=nbd@openwrt$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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