* linux-next: manual merge of the kmap_atomic tree with the staging.current tree
@ 2012-01-31 3:27 Stephen Rothwell
2012-01-31 3:39 ` Cong Wang
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-01-31 3:27 UTC (permalink / raw)
To: Cong Wang; +Cc: linux-next, linux-kernel, Greg Kroah-Hartman
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
Hi Cong,
Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/gma500/mmu.c between commit 344bc24c2947 ("staging:
delete gma500 driver") from the staging.current tree and commit
cb422c115787 ("gma500: remove the second argument of k[un]map_atomic()")
from the kmap_atomic tree.
The former removes this file (as the driver has migrated out of staging),
so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
2012-01-31 3:27 linux-next: manual merge of the kmap_atomic tree with the staging.current tree Stephen Rothwell
@ 2012-01-31 3:39 ` Cong Wang
0 siblings, 0 replies; 6+ messages in thread
From: Cong Wang @ 2012-01-31 3:39 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg Kroah-Hartman
On Tue, 2012-01-31 at 14:27 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/gma500/mmu.c between commit 344bc24c2947 ("staging:
> delete gma500 driver") from the staging.current tree and commit
> cb422c115787 ("gma500: remove the second argument of k[un]map_atomic()")
> from the kmap_atomic tree.
>
> The former removes this file (as the driver has migrated out of staging),
> so I did that.
>
Ok for me. Probably I need to remove that commit from my tree.
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the kmap_atomic tree with the staging.current tree
@ 2012-02-09 3:48 Stephen Rothwell
2012-02-09 8:39 ` Cong Wang
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-02-09 3:48 UTC (permalink / raw)
To: Cong Wang; +Cc: linux-next, linux-kernel, Seth Jennings, Greg KH
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
Hi Cong,
Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/zcache/zcache-main.c between commit 2a4830110b90
("staging: zcache: fix serialization bug in zv stats") from the
staging.current tree and commit a3a2486aeadb ("zcache: remove the second
argument of k [un]map_atomic()") from the kmap_atomic tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/zcache/zcache-main.c
index 875acd8,57550ae..0000000
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@@ -674,9 -675,9 +674,9 @@@ static struct zv_hdr *zv_create(struct
&page, &offset, ZCACHE_GFP_MASK);
if (unlikely(ret))
goto out;
- zv_curr_dist_counts[chunks]++;
- zv_cumul_dist_counts[chunks]++;
+ atomic_inc(&zv_curr_dist_counts[chunks]);
+ atomic_inc(&zv_cumul_dist_counts[chunks]);
- zv = kmap_atomic(page, KM_USER0) + offset;
+ zv = kmap_atomic(page) + offset;
zv->index = index;
zv->oid = *oid;
zv->pool_id = pool_id;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
2012-02-09 3:48 Stephen Rothwell
@ 2012-02-09 8:39 ` Cong Wang
2012-02-09 8:45 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Cong Wang @ 2012-02-09 8:39 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Seth Jennings, Greg KH, akpm
On Thu, 2012-02-09 at 14:48 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/zcache/zcache-main.c between commit 2a4830110b90
> ("staging: zcache: fix serialization bug in zv stats") from the
> staging.current tree and commit a3a2486aeadb ("zcache: remove the second
> argument of k [un]map_atomic()") from the kmap_atomic tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good. Thanks, Stephen!
Andrew, Greg,
As Linus doesn't want to merge my tree, could any of you take my patches
in kmap_atomic tree?
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
2012-02-09 8:39 ` Cong Wang
@ 2012-02-09 8:45 ` Andrew Morton
2012-02-09 9:26 ` Cong Wang
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2012-02-09 8:45 UTC (permalink / raw)
To: Cong Wang
Cc: Stephen Rothwell, linux-next, linux-kernel, Seth Jennings, Greg KH
On Thu, 09 Feb 2012 16:39:57 +0800 Cong Wang <amwang@redhat.com> wrote:
> As Linus doesn't want to merge my tree, could any of you take my patches
> in kmap_atomic tree?
He's not the messiah, he's a very naughty boy.
Send 'em over.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the kmap_atomic tree with the staging.current tree
2012-02-09 8:45 ` Andrew Morton
@ 2012-02-09 9:26 ` Cong Wang
0 siblings, 0 replies; 6+ messages in thread
From: Cong Wang @ 2012-02-09 9:26 UTC (permalink / raw)
To: Andrew Morton
Cc: Stephen Rothwell, linux-next, linux-kernel, Seth Jennings, Greg KH
On Thu, 2012-02-09 at 00:45 -0800, Andrew Morton wrote:
> On Thu, 09 Feb 2012 16:39:57 +0800 Cong Wang <amwang@redhat.com> wrote:
>
> > As Linus doesn't want to merge my tree, could any of you take my patches
> > in kmap_atomic tree?
>
> He's not the messiah, he's a very naughty boy.
:)
>
> Send 'em over.
Okay, I will rebase them to the latest Linus tree and send them to you.
Thanks much!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-09 9:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-31 3:27 linux-next: manual merge of the kmap_atomic tree with the staging.current tree Stephen Rothwell
2012-01-31 3:39 ` Cong Wang
2012-02-09 3:48 Stephen Rothwell
2012-02-09 8:39 ` Cong Wang
2012-02-09 8:45 ` Andrew Morton
2012-02-09 9:26 ` Cong Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).