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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Linus <torvalds@linux-foundation.org>,
	"\"Pali Rohár\"" <pali.rohar@gmail.com>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Wed, 29 Jan 2014 14:46:00 +1100	[thread overview]
Message-ID: <20140129144600.772e7be42998c947203146b1@canb.auug.org.au> (raw)

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

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/afs/proc.c between commit b42d570c9fbe ("afs: get rid of junk in
fs/afs/proc.c") from Linus' tree and commit 1a3459681f5c ("afs: proc
cells and rootcell are writeable") from the akpm-current 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/afs/proc.c
index bddc5120ed40,276cb6ed0b93..000000000000

--- a/fs/afs/proc.c
+++ b/fs/afs/proc.c
@@@ -130,9 -147,13 +130,9 @@@ int afs_proc_init(void
  	if (!proc_afs)
  		goto error_dir;
  
- 	if (!proc_create("cells", 0, proc_afs, &afs_proc_cells_fops) ||
- 	    !proc_create("rootcell", 0, proc_afs, &afs_proc_rootcell_fops))
 -	p = proc_create("cells", S_IFREG | S_IRUGO | S_IWUSR, proc_afs, &afs_proc_cells_fops);
 -	if (!p)
 -		goto error_cells;
 -
 -	p = proc_create("rootcell", S_IFREG | S_IRUGO | S_IWUSR, proc_afs, &afs_proc_rootcell_fops);
 -	if (!p)
 -		goto error_rootcell;
++	if (!proc_create("cells", S_IFREG | S_IRUGO | S_IWUSR, proc_afs, &afs_proc_cells_fops) ||
++	    !proc_create("rootcell", S_IFREG | S_IRUGO | S_IWUSR, proc_afs, &afs_proc_rootcell_fops))
 +		goto error_tree;
  
  	_leave(" = 0");
  	return 0;

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