Merge branch 'master' into next

Conflicts:
	fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
  		nd->flags |= LOOKUP_CONTINUE;
  		err = exec_permission_lite(inode);
  		if (err == -EAGAIN)
- 			err = vfs_permission(nd, MAY_EXEC);
+ 			err = inode_permission(nd->path.dentry->d_inode,
+ 					       MAY_EXEC);
 +		if (!err)
 +			err = ima_path_check(&nd->path, MAY_EXEC);
   		if (err)
  			break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
  		flag &= ~O_TRUNC;
  	}

- 	error = vfs_permission(nd, acc_mode);
+ 	error = inode_permission(inode, acc_mode);
  	if (error)
  		return error;
 +
- 	error = ima_path_check(&nd->path,
++	error = ima_path_check(path,
 +			       acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
 +	if (error)
 +		return error;
  	/*
  	 * An append-only file must be opened in append mode for writing.
  	 */

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 6 insertions, 12 deletions

diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index bcec3f60bad9..acf39a646b2f 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -183,16 +183,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
 };
 
 /**
- * mpc8610_hpcd_machine: ASoC machine data
- */
-static struct snd_soc_card mpc8610_hpcd_machine = {
-        .probe = mpc8610_hpcd_machine_probe,
-        .remove = mpc8610_hpcd_machine_remove,
-        .name = "MPC8610 HPCD",
-        .num_links = 1,
-};
-
-/**
  * mpc8610_hpcd_probe: OF probe function for the fabric driver
  *
  * This function gets called when an SSI node is found in the device tree.
@@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
         machine_data->dai.codec_dai = &cs4270_dai; /* The codec_dai we want */
         machine_data->dai.ops = &mpc8610_hpcd_ops;
 
-        mpc8610_hpcd_machine.dai_link = &machine_data->dai;
+        machine_data->machine.probe = mpc8610_hpcd_machine_probe;
+        machine_data->machine.remove = mpc8610_hpcd_machine_remove;
+        machine_data->machine.name = "MPC8610 HPCD";
+        machine_data->machine.num_links = 1;
+        machine_data->machine.dai_link = &machine_data->dai;
 
         /* Allocate a new audio platform device structure */
         sound_device = platform_device_alloc("soc-audio", -1);
@@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
                 goto error;
         }
 
-        machine_data->sound_devdata.card = &mpc8610_hpcd_machine;
+        machine_data->sound_devdata.card = &machine_data->machine;
         machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270;
         machine_data->machine.platform = &fsl_soc_platform;