linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Joonsoo Kim <js1304@gmail.com>,
	David Howells <dhowells@redhat.com>,
	Al Viro <viro@zeniv.linux.org.uk>
Subject: linux-next: manual merge of the akpm tree with the vfs tree
Date: Mon, 29 Apr 2013 18:25:37 +1000	[thread overview]
Message-ID: <20130429182537.1a6c83aa578271d427dd0ce2@canb.auug.org.au> (raw)

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/internal.h between commit 4608da4a9433 ("proc: Move non-public
stuff from linux/proc_fs.h to fs/proc/internal.h") from the vfs tree and
commit "mm, vmalloc: move get_vmalloc_info() to vmalloc.c" from the akpm
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/proc/internal.h
index 04255b6,47eac85..0000000
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@@ -191,56 -157,36 +191,35 @@@ static inline struct proc_dir_entry *pd
  	atomic_inc(&pde->count);
  	return pde;
  }
 -void pde_put(struct proc_dir_entry *pde);
 -
 -int proc_fill_super(struct super_block *);
 -struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);
 -int proc_remount(struct super_block *sb, int *flags, char *data);
 +extern void pde_put(struct proc_dir_entry *);
  
  /*
 - * These are generic /proc routines that use the internal
 - * "struct proc_dir_entry" tree to traverse the filesystem.
 - *
 - * The /proc root directory has extended versions to take care
 - * of the /proc/<pid> subdirectories.
 + * inode.c
   */
 -int proc_readdir(struct file *, void *, filldir_t);
 -struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
 +struct pde_opener {
 +	struct file *file;
 +	struct list_head lh;
 +	int closing;
 +	struct completion *c;
 +};
  
 +extern const struct inode_operations proc_pid_link_inode_operations;
  
 +extern void proc_init_inodecache(void);
 +extern struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);
 +extern int proc_fill_super(struct super_block *);
 +extern void proc_entry_rundown(struct proc_dir_entry *);
  
 -/* Lookups */
 -typedef struct dentry *instantiate_t(struct inode *, struct dentry *,
 -				struct task_struct *, const void *);
 -int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
 -	const char *name, int len,
 -	instantiate_t instantiate, struct task_struct *task, const void *ptr);
 -int pid_revalidate(struct dentry *dentry, unsigned int flags);
 -struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task);
 -extern const struct dentry_operations pid_dentry_operations;
 -int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
 -int proc_setattr(struct dentry *dentry, struct iattr *attr);
 +/*
-  * mmu.c
-  */
- struct vmalloc_info {
- 	unsigned long	used;
- 	unsigned long	largest_chunk;
- };
- 
- #ifdef CONFIG_MMU
- #define VMALLOC_TOTAL (VMALLOC_END - VMALLOC_START)
- extern void get_vmalloc_info(struct vmalloc_info *);
- 
- #else
- #define VMALLOC_TOTAL 0UL
- static inline void get_vmalloc_info(struct vmalloc_info *vmi)
- {
- 	vmi->used = 0;
- 	vmi->largest_chunk = 0;
- }
- #endif
- 
- /*
 + * proc_devtree.c
 + */
 +#ifdef CONFIG_PROC_DEVICETREE
 +extern void proc_device_tree_init(void);
 +#endif
  
 +/*
 + * proc_namespaces.c
 + */
  extern const struct inode_operations proc_ns_dir_inode_operations;
  extern const struct file_operations proc_ns_dir_operations;
  

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

             reply	other threads:[~2013-04-29  8:25 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-29  8:25 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-15 11:33 Stephen Rothwell
2019-04-11  6:21 Stephen Rothwell
2018-05-17  6:36 Stephen Rothwell
2018-01-02  6:46 Stephen Rothwell
2016-12-12  5:52 Stephen Rothwell
2016-12-12  8:14 ` Ian Kent
2014-08-08  6:20 Stephen Rothwell
2013-09-10  4:41 Stephen Rothwell
2013-09-05  8:56 Stephen Rothwell
2013-04-30  5:54 Stephen Rothwell
2013-04-29  8:34 Stephen Rothwell
2013-04-04  6:26 Stephen Rothwell
2013-04-04  6:56 ` Andrew Morton
2013-04-04  7:02   ` Andrew Morton
2013-04-04  8:10     ` Al Viro
2013-04-04 23:18       ` Stephen Rothwell
2013-04-04  8:02   ` Al Viro
2013-04-04 15:43     ` Nathan Zimmer
2013-04-04  6:17 Stephen Rothwell
2013-04-04  6:12 Stephen Rothwell
2013-04-04 12:33 ` Jan Kara
2013-04-04  6:04 Stephen Rothwell
2013-02-25  3:40 Stephen Rothwell
2012-09-24 13:40 Stephen Rothwell
2012-09-24 13:12 Stephen Rothwell
2012-09-24 13:06 Stephen Rothwell
2012-07-22  5:44 Stephen Rothwell
2011-07-18  8:55 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130429182537.1a6c83aa578271d427dd0ce2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=dhowells@redhat.com \
    --cc=js1304@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    --subject='Re: linux-next: manual merge of the akpm tree with the vfs tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).