Merge tag 'v3.14.24' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

This is the 3.14.24 stable release

* tag 'v3.14.24' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (204 commits)
  Linux 3.14.24
  mm: page_alloc: fix zone allocation fairness on UP
  Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
  of: Fix overflow bug in string property parsing functions
  sysfs: driver core: Fix glue dir race condition by gdp_mutex
  i2c: at91: don't account as iowait
  regulator: max77693: Fix use of uninitialized regulator config
  powerpc: use device_online/offline() instead of cpu_up/down()
  pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
  acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80
  rbd: Fix error recovery in rbd_obj_read_sync()
  drm/radeon: remove invalid pci id
  drm/radeon/dpm: disable ulv support on SI
  drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size.
  sched: Use rq->rd in sched_setaffinity() under RCU read lock
  usb: gadget: f_fs: remove redundant ffs_data_get()
  usb: gadget: udc: core: fix kernel oops with soft-connect
  usb: gadget: function: acm: make f_acm pass USB20CV Chapter9
  usb: dwc3: gadget: fix set_halt() bug with pending transfers
  crypto: algif - avoid excessive use of socket buffer in skcipher
  ...

Conflicts:
	drivers/gpu/drm/tilcdc/tilcdc_drv.c
	drivers/usb/dwc3/gadget.c

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc drivers/ata/pata_serverworks.c
Simple merge

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/gpu/drm/tilcdc/tilcdc_drv.c
index f551d27,52b4711..4178f0f
--- 1/drivers/gpu/drm/tilcdc/tilcdc_drv.c
--- 2/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@@ -199,9 -202,16 +204,9 @@@ static int tilcdc_load(struct drm_devic
        if (IS_ERR(priv->clk)) {
                dev_err(dev->dev, "failed to get functional clock\n");
                ret = -ENODEV;
-               goto fail;
+               goto fail_iounmap;
        }
  
 -      priv->disp_clk = clk_get(dev->dev, "dpll_disp_ck");
 -      if (IS_ERR(priv->clk)) {
 -              dev_err(dev->dev, "failed to get display clock\n");
 -              ret = -ENODEV;
 -              goto fail_put_clk;
 -      }
 -
  #ifdef CONFIG_CPU_FREQ
        priv->lcd_fck_rate = clk_get_rate(priv->clk);
        priv->freq_transition.notifier_call = cpufreq_transition;
@@@ -209,7 -219,7 +214,7 @@@
                        CPUFREQ_TRANSITION_NOTIFIER);
        if (ret) {
                dev_err(dev->dev, "failed to register cpufreq notifier\n");
-               goto fail;
 -              goto fail_put_disp_clk;
++              goto fail_put_clk;
        }
  #endif
  
@@@ -297,8 -303,39 +306,37 @@@
  
        return 0;
  
- fail:
-       tilcdc_unload(dev);
+ fail_irq_uninstall:
+       pm_runtime_get_sync(dev->dev);
+       drm_irq_uninstall(dev);
+       pm_runtime_put_sync(dev->dev);
+ 
+ fail_vblank_cleanup:
+       drm_vblank_cleanup(dev);
+ 
+ fail_mode_config_cleanup:
+       drm_mode_config_cleanup(dev);
+ 
+ fail_cpufreq_unregister:
+       pm_runtime_disable(dev->dev);
+ #ifdef CONFIG_CPU_FREQ
+       cpufreq_unregister_notifier(&priv->freq_transition,
+                       CPUFREQ_TRANSITION_NOTIFIER);
 -fail_put_disp_clk:
 -      clk_put(priv->disp_clk);
+ #endif
+ 
+ fail_put_clk:
+       clk_put(priv->clk);
+ 
+ fail_iounmap:
+       iounmap(priv->mmio);
+ 
+ fail_free_wq:
+       flush_workqueue(priv->wq);
+       destroy_workqueue(priv->wq);
+ 
+ fail_free_priv:
+       dev->dev_private = NULL;
+       kfree(priv);
        return ret;
  }
  

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc drivers/media/usb/em28xx/em28xx-video.c
Simple merge

diff --cc drivers/mfd/ti_am335x_tscadc.c
Simple merge

diff --cc drivers/mtd/ubi/fastmap.c
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc drivers/tty/serial/serial_core.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
Simple merge

diff --cc drivers/usb/gadget/f_fs.c
Simple merge

diff --cc drivers/usb/gadget/udc-core.c
Simple merge

diff --cc drivers/usb/musb/musb_cppi41.c
index bb419a4,1d29bbf..eb9ede3
--- 1/drivers/usb/musb/musb_cppi41.c
--- 2/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@@ -196,10 -190,11 +196,11 @@@ static enum hrtimer_restart cppi41_rech
                }
        }
  
-       if (!list_empty(&controller->early_tx_list)) {
+       if (!list_empty(&controller->early_tx_list) &&
+           !hrtimer_is_queued(&controller->early_tx)) {
                ret = HRTIMER_RESTART;
                hrtimer_forward_now(&controller->early_tx,
 -                              ktime_set(0, 150 * NSEC_PER_USEC));
 +                              ktime_set(0, 50 * NSEC_PER_USEC));
        }
  
        spin_unlock_irqrestore(&musb->lock, flags);

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge

diff --cc drivers/usb/phy/phy.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc sound/soc/codecs/tlv320aic3x.c
Simple merge