Merge tag 'v3.10.17' into dev-kernel-3.10
Ajay Nandakumar [Thu, 31 Oct 2013 01:42:36 +0000 (06:42 +0530)]
This is the 3.10.17 stable release

Conflicts:
drivers/usb/host/xhci.c

Change-Id: I6bd3b15ff92a0b94568b9d02e9bb1036becfca20

31 files changed:
1  2 
Makefile
arch/arm/kernel/process.c
drivers/hid/hid-input.c
drivers/hid/hid-multitouch.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/tun.c
drivers/net/usb/cdc_ether.c
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/tty/serial/serial-tegra.c
drivers/usb/core/hub.c
drivers/usb/core/port.c
drivers/usb/gadget/f_fs.c
drivers/usb/host/xhci-hub.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
include/linux/hid.h
include/net/bluetooth/hci.h
init/main.c
kernel/fork.c
kernel/time/timekeeping.c
mm/memcontrol.c
mm/shmem.c
mm/vmscan.c
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/ipv4/af_inet.c
net/ipv4/tcp.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_hdmi.c
sound/soc/codecs/max98095.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1390,12 -1404,14 +1404,18 @@@ static void handle_cmd_completion(struc
                        inc_deq(xhci, xhci->cmd_ring);
                        return;
                }
+               /* There is no command to handle if we get a stop event when the
+                * command ring is empty, event->cmd_trb points to the next
+                * unset command
+                */
+               if (xhci->cmd_ring->dequeue == xhci->cmd_ring->enqueue)
+                       return;
        }
  
 +      /* return if command ring is empty */
 +      if (xhci->cmd_ring->dequeue == xhci->cmd_ring->enqueue)
 +              return;
 +
        switch (le32_to_cpu(xhci->cmd_ring->dequeue->generic.field[3])
                & TRB_TYPE_BITMASK) {
        case TRB_TYPE(TRB_ENABLE_SLOT):
@@@ -2623,10 -2598,9 +2614,10 @@@ static int xhci_configure_endpoint(stru
                cmd_completion = &virt_dev->cmd_completion;
                cmd_status = &virt_dev->cmd_status;
        }
 +      *cmd_status = 0;
        init_completion(cmd_completion);
  
-       cmd_trb = xhci->cmd_ring->dequeue;
+       cmd_trb = xhci_find_next_enqueue(xhci->cmd_ring);
        if (!ctx_change)
                ret = xhci_queue_configure_endpoint(xhci, in_ctx->dma,
                                udev->slot_id, must_succeed);
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
@@@ -74,8 -74,8 +74,9 @@@
  #include <linux/ptrace.h>
  #include <linux/blkdev.h>
  #include <linux/elevator.h>
+ #include <linux/random.h>
  
 +#include <linux/pasr.h>
  #include <asm/io.h>
  #include <asm/bugs.h>
  #include <asm/setup.h>
diff --cc kernel/fork.c
Simple merge
Simple merge
diff --cc mm/memcontrol.c
Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
@@@ -1530,34 -1474,12 +1556,36 @@@ static int generic_hdmi_playback_pcm_pr
        bool non_pcm;
  
        non_pcm = check_non_pcm_per_cvt(codec, cvt_nid);
+       per_pin->channels = substream->runtime->channels;
+       per_pin->setup = true;
  
 +#if defined(CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA) && defined(CONFIG_TEGRA_DC)
 +      if ((codec->preset->id == 0x10de0020) ||
 +              (codec->preset->id == 0x10de0022) ||
 +              (codec->preset->id == 0x10de0028) ||
 +              (codec->preset->id == 0x10de002a)) {
 +              int err = 0;
 +
 +              if (substream->runtime->channels == 2)
 +                      tegra_hdmi_audio_null_sample_inject(true);
 +              else
 +                      tegra_hdmi_audio_null_sample_inject(false);
 +
 +              /* Set hdmi:audio freq and source selection*/
 +              err = tegra_hdmi_setup_audio_freq_source(
 +                                      substream->runtime->rate, HDA);
 +              if ( err < 0 ) {
 +                      snd_printk(KERN_ERR
 +                              "Unable to set hdmi audio freq to %d \n",
 +                                              substream->runtime->rate);
 +                      return err;
 +              }
 +      }
 +#endif
 +
        hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels);
  
-       hdmi_setup_audio_infoframe(codec, pin_idx, non_pcm, substream);
+       hdmi_setup_audio_infoframe(codec, per_pin, non_pcm);
  
        return hdmi_setup_stream(codec, cvt_nid, pin_nid, stream_tag, format);
  }
Simple merge