Commit 5af7f626 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Pull the upstream for USB-audio regression revert, so that we can work
on the stuff again.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 886cd11f 3c02a6d9

drivers/auxdisplay/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ config CFAG12864B_RATE 


config IMG_ASCII_LCD

	tristate "Imagination Technologies ASCII LCD Display"

	depends on HAS_IOMEM

	default y if MIPS_MALTA || MIPS_SEAD3

	select SYSCON

	help

drivers/mtd/mtdsuper.c

+3 −3
Original line number Diff line number Diff line
@@ -79,14 +79,14 @@ static struct dentry *mount_mtd_aux(struct file_system_type *fs_type, int flags, 
	pr_debug("MTDSB: New superblock for device %d (\"%s\")\n",

	      mtd->index, mtd->name);



	ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);

	ret = fill_super(sb, data, flags & SB_SILENT ? 1 : 0);

	if (ret < 0) {

		deactivate_locked_super(sb);

		return ERR_PTR(ret);

	}



	/* go */

	sb->s_flags |= MS_ACTIVE;

	sb->s_flags |= SB_ACTIVE;

	return dget(sb->s_root);



	/* new mountpoint for an already mounted superblock */
@@ -202,7 +202,7 @@ struct dentry *mount_mtd(struct file_system_type *fs_type, int flags, 
not_an_MTD_device:

#endif /* CONFIG_BLOCK */



	if (!(flags & MS_SILENT))

	if (!(flags & SB_SILENT))

		printk(KERN_NOTICE

		       "MTD: Attempt to mount non-MTD device \"%s\"\n",

		       dev_name);

drivers/staging/lustre/lustre/llite/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static bool file_is_noatime(const struct file *file) 
	if ((mnt->mnt_flags & MNT_NODIRATIME) && S_ISDIR(inode->i_mode))

		return true;



	if ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode))

	if ((inode->i_sb->s_flags & SB_NODIRATIME) && S_ISDIR(inode->i_mode))

		return true;



	return false;

drivers/staging/lustre/lustre/llite/llite_lib.c

+7 −7
Original line number Diff line number Diff line
@@ -313,11 +313,11 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt, 
	}



	if (data->ocd_connect_flags & OBD_CONNECT_ACL) {

		sb->s_flags |= MS_POSIXACL;

		sb->s_flags |= SB_POSIXACL;

		sbi->ll_flags |= LL_SBI_ACL;

	} else {

		LCONSOLE_INFO("client wants to enable acl, but mdt not!\n");

		sb->s_flags &= ~MS_POSIXACL;

		sb->s_flags &= ~SB_POSIXACL;

		sbi->ll_flags &= ~LL_SBI_ACL;

	}
@@ -660,7 +660,7 @@ void ll_kill_super(struct super_block *sb) 
	struct ll_sb_info *sbi;



	/* not init sb ?*/

	if (!(sb->s_flags & MS_ACTIVE))

	if (!(sb->s_flags & SB_ACTIVE))

		return;



	sbi = ll_s2sbi(sb);
@@ -2039,8 +2039,8 @@ int ll_remount_fs(struct super_block *sb, int *flags, char *data) 
	int err;

	__u32 read_only;



	if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {

		read_only = *flags & MS_RDONLY;

	if ((bool)(*flags & SB_RDONLY) != sb_rdonly(sb)) {

		read_only = *flags & SB_RDONLY;

		err = obd_set_info_async(NULL, sbi->ll_md_exp,

					 sizeof(KEY_READ_ONLY),

					 KEY_READ_ONLY, sizeof(read_only),
@@ -2053,9 +2053,9 @@ int ll_remount_fs(struct super_block *sb, int *flags, char *data) 
		}



		if (read_only)

			sb->s_flags |= MS_RDONLY;

			sb->s_flags |= SB_RDONLY;

		else

			sb->s_flags &= ~MS_RDONLY;

			sb->s_flags &= ~SB_RDONLY;



		if (sbi->ll_flags & LL_SBI_VERBOSE)

			LCONSOLE_WARN("Remounted %s %s\n", profilenm,

fs/9p/vfs_super.c

+3 −3
Original line number Diff line number Diff line
@@ -94,13 +94,13 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses, 
	if (v9ses->cache)

		sb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024)/PAGE_SIZE;



	sb->s_flags |= MS_ACTIVE | MS_DIRSYNC | MS_NOATIME;

	sb->s_flags |= SB_ACTIVE | SB_DIRSYNC | SB_NOATIME;

	if (!v9ses->cache)

		sb->s_flags |= MS_SYNCHRONOUS;

		sb->s_flags |= SB_SYNCHRONOUS;



#ifdef CONFIG_9P_FS_POSIX_ACL

	if ((v9ses->flags & V9FS_ACL_MASK) == V9FS_POSIX_ACL)

		sb->s_flags |= MS_POSIXACL;

		sb->s_flags |= SB_POSIXACL;

#endif



	return 0;