Merge branch 'master' into next

* master:
  aft: Pass correct afsi argument to AFSI_CHANGE event handlers.

diff --cc aft.c
index a9145f2cb4ea65264664e970fa0d2b471f1c3926,383439d08256a4a245e2b6de5b4ff46a479438d5..a19933dd13e97b3554c82ddfbd0a59e7029f7ae9
--- 1/aft.c
--- 2/aft.c
+++ b/aft.c
@@@ -1041,9 -1041,9 +1041,9 @@@ out
   */
  int open_and_update_audio_file(int *fd)
  {
 -      unsigned char file_hash[HASH2_SIZE];
 +      unsigned char file_hash[HASH_SIZE];
        struct osl_object afsi_obj;
-       struct afs_info new_afsi;
+       struct afs_info old_afsi;
        int ret;
        struct afsi_change_event_data aced;
        struct osl_object map, chunk_table_obj;