1. 22 Jun, 2016 2 commits
    • Vinod Koul's avatar
      ASoC: Intel: Kconfig: formatting update · c3f2fe62
      Vinod Koul authored
      Kconfig help texts were missing periods as suggested by Randy.
      
      Also fix the alignment on a block of help text to be consistent
      with rest.
      Suggested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      c3f2fe62
    • Vinod Koul's avatar
      ASoC: Intel: Kconfig: fix build when ACPI is not enabled · 3493d4a8
      Vinod Koul authored
      Randy reported following error when ACPI is not enabled:
      
      warning: (SND_SOC_INTEL_BYTCR_RT5640_MACH && SND_SOC_INTEL_BYTCR_RT5651_MACH
      && SND_SOC_INTEL_CHT_BSW_RT5672_MACH && SND_SOC_INTEL_CHT_BSW_RT5645_MACH &&
      SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) selects SND_SST_IPC_ACPI
      +which has unmet direct dependencies (SOUND && !M68K && !UML && SND &&
      SND_SOC && ACPI)
      
      causing these build errors:
      
      In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:40:0:
      ../include/acpi/acpi_bus.h:65:20: error: conflicting types for
      'acpi_evaluate_dsm'
       union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid,
      In file included from ../sound/soc/intel/atom/sst/sst_acpi.c:31:0:
      ../include/linux/acpi.h:676:34: note: previous definition of
      'acpi_evaluate_dsm' was here
       static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle,
      
      CONFIG_SND_SST_IPC_ACPI was already dependent upon ACPI, but that was not
      solving it. So move the depends up to machine drivers and remove from
      CONFIG_SND_SST_IPC_ACPI.
      Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      3493d4a8
  2. 14 Jun, 2016 8 commits
  3. 07 Jun, 2016 10 commits
  4. 01 Jun, 2016 2 commits
  5. 31 May, 2016 2 commits
  6. 30 May, 2016 11 commits
  7. 29 May, 2016 3 commits
  8. 28 May, 2016 2 commits
    • Mikulas Patocka's avatar
      hpfs: implement the show_options method · 037369b8
      Mikulas Patocka authored
      The HPFS filesystem used generic_show_options to produce string that is
      displayed in /proc/mounts.  However, there is a problem that the options
      may disappear after remount.  If we mount the filesystem with option1
      and then remount it with option2, /proc/mounts should show both option1
      and option2, however it only shows option2 because the whole option
      string is replaced with replace_mount_options in hpfs_remount_fs.
      
      To fix this bug, implement the hpfs_show_options function that prints
      options that are currently selected.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      037369b8
    • Mikulas Patocka's avatar
      affs: fix remount failure when there are no options changed · 01d6e087
      Mikulas Patocka authored
      Commit c8f33d0b ("affs: kstrdup() memory handling") checks if the
      kstrdup function returns NULL due to out-of-memory condition.
      
      However, if we are remounting a filesystem with no change to
      filesystem-specific options, the parameter data is NULL.  In this case,
      kstrdup returns NULL (because it was passed NULL parameter), although no
      out of memory condition exists.  The mount syscall then fails with
      ENOMEM.
      
      This patch fixes the bug.  We fail with ENOMEM only if data is non-NULL.
      
      The patch also changes the call to replace_mount_options - if we didn't
      pass any filesystem-specific options, we don't call
      replace_mount_options (thus we don't erase existing reported options).
      
      Fixes: c8f33d0b ("affs: kstrdup() memory handling")
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org	# v4.1+
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      01d6e087