Merge linux-3.10.67 into dev-kernel-3.10
Ishan Mittal [Wed, 11 Feb 2015 06:18:25 +0000 (11:18 +0530)]
Conflicts:
fs/pstore/ram_core.c
kernel/time/sched_clock.c
sound/soc/codecs/max98090.c

Bug 200063550

Change-Id: I345f603c8d1232339e5bb43efe755f416f837945
Signed-off-by: Ishan Mittal <imittal@nvidia.com>

42 files changed:
1  2 
Documentation/kernel-parameters.txt
Makefile
arch/arm/mach-omap2/timer.c
arch/arm/mm/proc-v7.S
block/genhd.c
drivers/gpio/gpiolib-of.c
drivers/gpio/gpiolib.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/i2c-hid/i2c-hid.c
drivers/input/joystick/xpad.c
drivers/mmc/card/block.c
drivers/mmc/host/sdhci.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/of/address.c
drivers/pci/msi.c
drivers/pci/probe.c
drivers/pinctrl/core.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/usb/class/cdc-acm.c
drivers/usb/host/xhci-ring.c
fs/ext4/ext4.h
fs/ext4/extents.c
fs/ext4/mballoc.c
fs/fs-writeback.c
fs/nfs/nfs4proc.c
fs/proc/base.c
fs/pstore/ram.c
fs/pstore/ram_core.c
include/linux/mm.h
include/linux/pci.h
include/linux/pstore_ram.h
kernel/pid.c
mm/memory.c
mm/mmap.c
mm/vmscan.c
net/ipv4/tcp_output.c
net/netlink/af_netlink.c
scripts/recordmcount.pl
sound/pci/hda/hda_codec.c
sound/soc/codecs/max98090.c

Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc block/genhd.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1877,17 -1314,13 +1877,19 @@@ static void sdhci_request(struct mmc_ho
  
        host = mmc_priv(mmc);
  
 +#ifdef CONFIG_DEBUG_FS
 +      if (mrq->data && mrq->data->blocks)
 +              update_stat(host, mrq->data->blksz, mrq->data->blocks,
 +                      true, false, mrq->data->flags);
 +#endif
 +
        sdhci_runtime_pm_get(host);
  
+       present = mmc_gpio_get_cd(host->mmc);
        spin_lock_irqsave(&host->lock, flags);
  
 -      WARN_ON(host->mrq != NULL);
 +      WARN_ON(host->mrq_cmd != NULL);
  
  #ifndef SDHCI_USE_LEDS_CLASS
        sdhci_activate_led(host);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/ext4.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc fs/pstore/ram.c
@@@ -82,9 -82,9 +87,10 @@@ struct ramoops_context 
        struct persistent_ram_zone **przs;
        struct persistent_ram_zone *cprz;
        struct persistent_ram_zone *fprz;
 +      struct persistent_ram_zone *rprz;
        phys_addr_t phys_addr;
        unsigned long size;
+       unsigned int memtype;
        size_t record_size;
        size_t console_size;
        size_t ftrace_size;
@@@ -449,41 -398,27 +456,42 @@@ static int ramoops_probe(struct platfor
         */
        if (cxt->max_dump_cnt)
                goto fail_out;
 -
 -      if (!pdata->mem_size || (!pdata->record_size && !pdata->console_size &&
 -                      !pdata->ftrace_size)) {
 -              pr_err("The memory size and the record/console size must be "
 -                      "non-zero\n");
 +      if ((pdata->mem_size && pdata->record_size) == 0) {
 +              pr_err("The memory size and the record size must be non-zero\n");
                goto fail_out;
        }
 -
 -      if (!is_power_of_2(pdata->mem_size))
 +#ifdef CONFIG_PSTORE_CONSOLE
 +      if (pdata->console_size == 0) {
 +              pr_err("PSTORE_CONSOLE is enabled, console size must be non-zero\n");
 +              goto fail_out;
 +      }
 +#endif
 +#ifdef CONFIG_PSTORE_FTRACE
 +      if (pdata->ftrace_size == 0) {
 +              pr_err("PSTORE_FTRACE is enabled, ftrace size must be non-zero\n");
 +              goto fail_out;
 +      }
 +#endif
 +#ifdef CONFIG_PSTORE_RTRACE
 +      if (pdata->rtrace_size == 0) {
 +              pr_err("PSTORE_RTRACE is enabled, rtrace size must be non-zero\n");
 +              goto fail_out;
 +      }
 +#endif
 +      if (pdata->mem_size && !is_power_of_2(pdata->mem_size))
                pdata->mem_size = rounddown_pow_of_two(pdata->mem_size);
 -      if (!is_power_of_2(pdata->record_size))
 +      if (pdata->record_size && !is_power_of_2(pdata->record_size))
                pdata->record_size = rounddown_pow_of_two(pdata->record_size);
 -      if (!is_power_of_2(pdata->console_size))
 +      if (pdata->console_size && !is_power_of_2(pdata->console_size))
                pdata->console_size = rounddown_pow_of_two(pdata->console_size);
 -      if (!is_power_of_2(pdata->ftrace_size))
 +      if (pdata->ftrace_size && !is_power_of_2(pdata->ftrace_size))
                pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
 +      if (pdata->rtrace_size && !is_power_of_2(pdata->rtrace_size))
 +              pdata->rtrace_size = rounddown_pow_of_two(pdata->rtrace_size);
  
 -      cxt->dump_read_cnt = 0;
        cxt->size = pdata->mem_size;
        cxt->phys_addr = pdata->mem_address;
+       cxt->memtype = pdata->mem_type;
        cxt->record_size = pdata->record_size;
        cxt->console_size = pdata->console_size;
        cxt->ftrace_size = pdata->ftrace_size;
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/pid.c
Simple merge
diff --cc mm/memory.c
Simple merge
diff --cc mm/mmap.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2096,10 -1360,15 +2096,17 @@@ static const struct snd_soc_dapm_route 
        {"DACL", NULL, "LTENL Mux"},
        {"DACR", NULL, "LTENR Mux"},
  
+       {"STENL Mux", "Sidetone Left", "ADCL"},
+       {"STENL Mux", "Sidetone Left", "DMICL"},
+       {"STENR Mux", "Sidetone Right", "ADCR"},
+       {"STENR Mux", "Sidetone Right", "DMICR"},
+       {"DACL", NULL, "STENL Mux"},
+       {"DACR", NULL, "STENL Mux"},
        {"AIFINL", NULL, "SHDN"},
        {"AIFINR", NULL, "SHDN"},
 +      {"AIFINL", NULL, "VCM"},
 +      {"AIFINR", NULL, "VCM"},
        {"AIFINL", NULL, "SDIEN"},
        {"AIFINR", NULL, "SDIEN"},
        {"DACL", NULL, "SHDN"},