The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 --
drivers/mmc/host/dw_mmc.c | 6 ---
drivers/mmc/host/sdhci-pci-core.c | 22 -------------
3 files changed, 33 deletions(-)
diff -puN drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c~linux-next-git-rejects drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -2909,12 +2909,7 @@ static int smu7_apply_state_adjust_rules
else
disable_mclk_switching = ((1 < info.display_count) ||
disable_mclk_switching_for_frame_lock ||
-<<<<<<< HEAD
- smu7_vblank_too_short(hwmgr, mode_info.vblank_time_us) ||
- (mode_info.refresh_rate > 120));
-=======
smu7_vblank_too_short(hwmgr, mode_info.vblank_time_us));
->>>>>>> linux-next/akpm-base
sclk = smu7_ps->performance_levels[0].engine_clock;
mclk = smu7_ps->performance_levels[0].memory_clock;
diff -puN drivers/mmc/host/dw_mmc.c~linux-next-git-rejects drivers/mmc/host/dw_mmc.c
--- a/drivers/mmc/host/dw_mmc.c~linux-next-git-rejects
+++ a/drivers/mmc/host/dw_mmc.c
@@ -163,12 +163,6 @@ static int dw_mci_regs_show(struct seq_f
seq_printf(s, "CLKENA:\t0x%08x\n", mci_readl(host, CLKENA));
pm_runtime_put_autosuspend(host->dev);
-<<<<<<< HEAD
-
- return 0;
-}
-=======
->>>>>>> linux-next/akpm-base
return 0;
}
diff -puN drivers/mmc/host/sdhci-pci-core.c~linux-next-git-rejects drivers/mmc/host/sdhci-pci-core.c
--- a/drivers/mmc/host/sdhci-pci-core.c~linux-next-git-rejects
+++ a/drivers/mmc/host/sdhci-pci-core.c
@@ -667,7 +667,6 @@ static void byt_read_dsm(struct sdhci_pc
}
static int intel_execute_tuning(struct mmc_host *mmc, u32 opcode)
-<<<<<<< HEAD
{
int err = sdhci_execute_tuning(mmc, opcode);
struct sdhci_host *host = mmc_priv(mmc);
@@ -687,27 +686,6 @@ static int intel_execute_tuning(struct m
static void byt_probe_slot(struct sdhci_pci_slot *slot)
{
-=======
-{
- int err = sdhci_execute_tuning(mmc, opcode);
- struct sdhci_host *host = mmc_priv(mmc);
-
- if (err)
- return err;
-
- /*
- * Tuning can leave the IP in an active state (Buffer Read Enable bit
- * set) which prevents the entry to low power states (i.e. S0i3). Data
- * reset will clear it.
- */
- sdhci_reset(host, SDHCI_RESET_DATA);
-
- return 0;
-}
-
-static void byt_probe_slot(struct sdhci_pci_slot *slot)
-{
->>>>>>> linux-next/akpm-base
struct mmc_host_ops *ops = &slot->host->mmc_host_ops;
byt_read_dsm(slot);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
sysctl-add-flags-to-support-min-max-range-clamping-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
