linux-next: manual merge of the bkl-config tree with thestaging-next tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the bkl-config tree got a conflict in
fs/compat_ioctl.c between commit 2116b7a473bf1c8d26998b477c294e7fe294921f
("smbfs: move to drivers/staging") from the staging-next tree and commit
b9abbb0214fbdbdf36fc0edebd4b1adb7ddb3a12 ("fix rawctl compat ioctls
breakage on amd64 and itanic") from the bkl-config tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/compat_ioctl.c
index 34cf03c,d0ad09d..0000000
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@@ -1242,9 -1199,8 +1179,6 @@@ COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE5
  COMPATIBLE_IOCTL(SOUND_MIXER_GETLEVELS)
  COMPATIBLE_IOCTL(SOUND_MIXER_SETLEVELS)
  COMPATIBLE_IOCTL(OSS_GETVERSION)
- /* Raw devices */
- COMPATIBLE_IOCTL(RAW_SETBIND)
- COMPATIBLE_IOCTL(RAW_GETBIND)
 -/* SMB ioctls which do not need any translations */
 -COMPATIBLE_IOCTL(SMB_IOC_NEWCONN)
  /* Watchdog */
  COMPATIBLE_IOCTL(WDIOC_GETSUPPORT)
  COMPATIBLE_IOCTL(WDIOC_GETSTATUS)
@@@ -1501,11 -1457,11 +1435,7 @@@ static long do_ioctl_trans(int fd, unsi
  	case MTIOCGET32:
  	case MTIOCPOS32:
  		return mt_ioctl_trans(fd, cmd, argp);
- 	/* Raw devices */
- 	case RAW_SETBIND:
- 	case RAW_GETBIND:
- 		return raw_ioctl(fd, cmd, argp);
  #endif
 -	/* One SMB ioctl needs translations. */
 -#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t)
 -	case SMB_IOC_GETMOUNTUID_32:
 -		return do_smb_getmountuid(fd, cmd, argp);
  	/* Serial */
  	case TIOCGSERIAL:
  	case TIOCSSERIAL:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/