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,
	David Howells <dhowells@redhat.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Pavel Emelyanov <xemul@parallels.com>
Subject: linux-next: manual merge of the akpm tree with the  vfstree
Date: Mon, 29 Apr 2013 18:29:06 +1000	[thread overview]
Message-ID: <20130429182906.a964166ca79375595a16681c@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2926 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 "pagemap: introduce the /proc/PID/pagemap2 file" 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 d600fb0,188b886..0000000
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@@ -223,76 -191,4 +223,77 @@@ extern void proc_device_tree_init(void)
  extern const struct inode_operations proc_ns_dir_inode_operations;
  extern const struct file_operations proc_ns_dir_operations;
  
 +/*
 + * proc_net.c
 + */
 +extern const struct file_operations proc_net_operations;
 +extern const struct inode_operations proc_net_inode_operations;
 +
 +#ifdef CONFIG_NET
 +extern int proc_net_init(void);
 +#else
 +static inline int proc_net_init(void) { return 0; }
 +#endif
 +
 +/*
 + * proc_self.c
 + */
  extern int proc_setup_self(struct super_block *);
 +
 +/*
 + * proc_sysctl.c
 + */
 +#ifdef CONFIG_PROC_SYSCTL
 +extern int proc_sys_init(void);
 +extern void sysctl_head_put(struct ctl_table_header *);
 +#else
 +static inline void proc_sys_init(void) { }
 +static inline void sysctl_head_put(struct ctl_table_header *head) { }
 +#endif
 +
 +/*
 + * proc_tty.c
 + */
 +#ifdef CONFIG_TTY
 +extern void proc_tty_init(void);
 +#else
 +static inline void proc_tty_init(void) {}
 +#endif
 +
 +/*
 + * root.c
 + */
 +extern struct proc_dir_entry proc_root;
 +
 +extern void proc_self_init(void);
 +extern int proc_remount(struct super_block *, int *, char *);
 +
 +/*
 + * task_[no]mmu.c
 + */
 +struct proc_maps_private {
 +	struct pid *pid;
 +	struct task_struct *task;
 +#ifdef CONFIG_MMU
 +	struct vm_area_struct *tail_vma;
 +#endif
 +#ifdef CONFIG_NUMA
 +	struct mempolicy *task_mempolicy;
 +#endif
 +};
 +
 +extern const struct file_operations proc_pid_maps_operations;
 +extern const struct file_operations proc_tid_maps_operations;
 +extern const struct file_operations proc_pid_numa_maps_operations;
 +extern const struct file_operations proc_tid_numa_maps_operations;
 +extern const struct file_operations proc_pid_smaps_operations;
 +extern const struct file_operations proc_tid_smaps_operations;
 +extern const struct file_operations proc_clear_refs_operations;
 +extern const struct file_operations proc_pagemap_operations;
++extern const struct file_operations proc_pagemap2_operations;
 +
 +extern unsigned long task_vsize(struct mm_struct *);
 +extern unsigned long task_statm(struct mm_struct *,
 +				unsigned long *, unsigned long *,
 +				unsigned long *, unsigned long *);
 +extern void task_mem(struct seq_file *, struct mm_struct *);

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

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

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20130429182906.a964166ca79375595a16681c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    --cc=xemul@parallels.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).