linux-next: manual merge of the akpm tree with Linus' tree

Stephen Rothwell
2012-05-21T08:23:57Z

[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/base.c between commit 30a08bf2d31d ("proc: move fd symlink i_mode
calculations into tid_fd_revalidate()") from the tree and commit "proc:
pass "fd" by value in /proc/*/{fd,fdinfo} code" from the akpm 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 fs/proc/base.c
index 2308157,c560fc8..0000000
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -1847,7 -1835,9 +1847,7 @@@ static const struct dentry_operations t
static struct dentry *proc_fd_instantiate(struct inode *dir,
struct dentry *dentry, struct task_struct *task, const void *ptr)
{
- unsigned fd = *(const unsigned *)ptr;
+ unsigned fd = (unsigned long)ptr;
- struct file *file;
- struct files_struct *files;
struct inode *inode;
struct proc_inode *ei;
struct dentry *error = ERR_PTR(-ENOENT);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]