* linux-next: manual merge of the kmap_atomic tree with the ecryptfs tree
@ 2012-01-25 2:32 Stephen Rothwell
2012-01-25 12:35 ` Cong Wang
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-01-25 2:32 UTC (permalink / raw)
To: Cong Wang; +Cc: linux-next, linux-kernel, Tyler Hicks
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
Hi Cong,
Today's linux-next merge of the kmap_atomic tree got a conflict in
fs/ecryptfs/read_write.c between commit f28b7904d455 ("eCryptfs: Remove
unused ecryptfs_read()") from the ecryptfs tree and commit 27de090e3326
("ecryptfs: remove the second argument of k[un]map_atomic()") from the
kmap_atomic tree.
The former just removed the entire ecryptfs_read() function that was
modified as part of the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- 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 the ecryptfs tree
2012-01-25 2:32 linux-next: manual merge of the kmap_atomic tree with the ecryptfs tree Stephen Rothwell
@ 2012-01-25 12:35 ` Cong Wang
0 siblings, 0 replies; 2+ messages in thread
From: Cong Wang @ 2012-01-25 12:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tyler Hicks
On Wed, 2012-01-25 at 13:32 +1100, Stephen Rothwell wrote:
> Hi Cong,
>
> Today's linux-next merge of the kmap_atomic tree got a conflict in
> fs/ecryptfs/read_write.c between commit f28b7904d455 ("eCryptfs: Remove
> unused ecryptfs_read()") from the ecryptfs tree and commit 27de090e3326
> ("ecryptfs: remove the second argument of k[un]map_atomic()") from the
> kmap_atomic tree.
>
> The former just removed the entire ecryptfs_read() function that was
> modified as part of the latter, so I did that.
>
Hi, Stephen,
Sounds good to me! Thank you!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-25 12:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-25 2:32 linux-next: manual merge of the kmap_atomic tree with the ecryptfs tree Stephen Rothwell
2012-01-25 12:35 ` 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).