From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Stefani Seibold <stefani@seibold•net>,
Andrew Morton <akpm@linux-foundation•org>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>
Subject: Re: linux-next: manual merge of the acpi tree with Linus' tree
Date: Thu, 24 Dec 2009 09:39:13 +1100 [thread overview]
Message-ID: <20091224093913.4f29f37b.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20091224091141.fa1cea64.sfr@canb.auug.org.au>
Hi Len,
On Thu, 24 Dec 2009 09:11:41 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/platform/x86/sony-laptop.c between commits
> 45465487897a1c6d508b14b904dc5777f7ec7e04 ("kfifo: move struct kfifo in
> place"), c1e13f25674ed564948ecb7dfe5f83e578892896 ("kfifo: move out
> spinlock") and 7acd72eb85f1c7a15e8b5eb554994949241737f1 ("kfifo: rename
> kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out...") from
> Linus' tree and commit a287e9f941cf4bb8c167802c0f1cf04a93bc4e4c
> ("sony-laptop: remove private workqueue, use keventd instead") from the
> acpi tree.
>
> I fixed it up (see below) and can cay the fix for a while. This fix
> needs checking.
I applied the following further patch (and there may be more fixes
necessary).
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 24 Dec 2009 09:36:07 +1100
Subject: [PATCH] acpi: further update for __kfifo_len API change
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/platform/x86/sony-laptop.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 9d05a1e..84a1736 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -317,7 +317,7 @@ static void do_sony_laptop_release_key(struct work_struct *work)
* extra "empty" wakeup. This may be improved with the new
* kfifo API.
*/
- if (__kfifo_len(sony_laptop_input.fifo) != 0)
+ if (kfifo_len(&sony_laptop_input.fifo) != 0)
schedule_delayed_work(dwork, msecs_to_jiffies(10));
}
--
1.6.5.4
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
next prev parent reply other threads:[~2009-12-23 22:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-23 22:11 linux-next: manual merge of the acpi tree with Linus' tree Stephen Rothwell
2009-12-23 22:39 ` Stephen Rothwell [this message]
2009-12-24 0:02 ` Stephen Rothwell
2009-12-24 5:02 ` Len Brown
2009-12-24 12:26 ` Stephen Rothwell
2009-12-24 20:05 ` Len Brown
2009-12-25 0:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-10-07 23:49 Stephen Rothwell
2012-10-04 1:40 Stephen Rothwell
2012-03-30 0:46 Stephen Rothwell
2010-05-12 1:21 Stephen Rothwell
2010-01-18 2:56 Stephen Rothwell
2010-01-20 6:12 ` Len Brown
2010-01-20 6:29 ` Stephen Rothwell
2009-12-16 2:00 Stephen Rothwell
2009-03-30 3:20 Stephen Rothwell
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=20091224093913.4f29f37b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=stefani@seibold$(echo .)net \
/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