2012-02-13 05:27:57

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: manual merge of the kmap_atomic tree with the staging tree

---

Hi Cong,

Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/zram/xvmalloc.c between commit b154ff05e1b0 ("staging:
zram: remove xvmalloc") from the staging tree and commit ea81cfe7d7fb
("zram: remove the second argument of k[un]map_atomic()") from the
kmap_atomic tree.

The former removed the file, so I did that.
--
Cheers,
Stephen Rothwell [email protected]

---

Attachments:

(No filename) (417.00 B)
(No filename) (836.00 B)
Download all attachments

2012-02-13 09:00:39

by Cong Wang

[permalink] [raw]

Subject: Re: linux-next: manual merge of the kmap_atomic tree with the staging tree

---

On Mon, 2012-02-13 at 16:27 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/zram/xvmalloc.c between commit b154ff05e1b0 ("staging:
> zram: remove xvmalloc") from the staging tree and commit ea81cfe7d7fb
> ("zram: remove the second argument of k[un]map_atomic()") from the
> kmap_atomic tree.
>
> The former removed the file, so I did that.

Ok, thanks!