* linux-next: manual merge of the kmap_atomic tree with Linus' tree
@ 2012-02-10 5:17 Stephen Rothwell
2012-02-10 5:26 ` Cong Wang
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-02-10 5:17 UTC (permalink / raw)
To: Cong Wang; +Cc: linux-next, linux-kernel, Evgeniy Polyakov
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
Hi Cong,
Today's linux-next merge of the kmap_atomic tree got a conflict in
drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging:
pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit
709bc0d6b5c6 ("pohmelfs: remove the second argument of k[un]map_atomic
()") from the kmap_atomic tree.
The former removes the file, 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] 2+ messages in thread
* Re: linux-next: manual merge of the kmap_atomic tree with Linus' tree
2012-02-10 5:17 linux-next: manual merge of the kmap_atomic tree with Linus' tree Stephen Rothwell
@ 2012-02-10 5:26 ` Cong Wang
0 siblings, 0 replies; 2+ messages in thread
From: Cong Wang @ 2012-02-10 5:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Evgeniy Polyakov
On Fri, 2012-02-10 at 16:17 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging:
> pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit
> 709bc0d6b5c6 ("pohmelfs: remove the second argument of k[un]map_atomic
> ()") from the kmap_atomic tree.
>
> The former removes the file, so I did that.
Ok, I will drop that commit.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-10 5:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-10 5:17 linux-next: manual merge of the kmap_atomic tree with Linus' tree Stephen Rothwell
2012-02-10 5: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).