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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the ext4 tree got a conflict in:

  fs/ext4/ioctl.c

between commit:

  4db5c2e6236f ("ext4: convert to fileattr")

from Linus' tree and commit:

  339183dfb87c ("ext4: add ioctl EXT4_IOC_CHECKPOINT")

from the ext4 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ext4/ioctl.c
index 31627f7dc5cd,d25eaec1afdc..000000000000
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@@ -1291,6 -1455,9 +1335,7 @@@ long ext4_compat_ioctl(struct file *fil
  	case EXT4_IOC_CLEAR_ES_CACHE:
  	case EXT4_IOC_GETSTATE:
  	case EXT4_IOC_GET_ES_CACHE:
 -	case FS_IOC_FSGETXATTR:
 -	case FS_IOC_FSSETXATTR:
+ 	case EXT4_IOC_CHECKPOINT:
  		break;
  	default:
  		return -ENOIOCTLCMD;

Attachment: pgp93_mWqDMJP.pgp
Description: OpenPGP digital signature