From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Date: Fri, 07 Sep 2012 12:12:47 -0700 Message-ID: <20120907191248.D8A1C100048@wpzn3.hot.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-qc0-f202.google.com ([209.85.216.202]:49019 "EHLO mail-qc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753283Ab2IGTNG (ORCPT ); Fri, 7 Sep 2012 15:13:06 -0400 Received: by qcqs25 with SMTP id s25so319148qcq.1 for ; Fri, 07 Sep 2012 12:13:04 -0700 (PDT) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org The patch titled Subject: linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/mmc/host/mxs-mmc.c | 8 -------- sound/pci/hda/hda_codec.c | 9 --------- sound/pci/hda/hda_codec.h | 4 ---- 3 files changed, 21 deletions(-) diff -puN drivers/mmc/host/mxs-mmc.c~linux-next-git-rejects drivers/mmc/host/mxs-mmc.c --- a/drivers/mmc/host/mxs-mmc.c~linux-next-git-rejects +++ a/drivers/mmc/host/mxs-mmc.c @@ -527,11 +527,7 @@ static void mxs_mmc_enable_sdio_irq(stru writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET); writel(BM_SSP_CTRL1_SDIO_IRQ_EN, -<<<<<<< HEAD - host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET); -======= ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET); ->>>>>>> linux-next/akpm-base } else { writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK, ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR); @@ -541,11 +537,7 @@ static void mxs_mmc_enable_sdio_irq(stru spin_unlock_irqrestore(&host->lock, flags); -<<<<<<< HEAD - if (enable && readl(host->base + HW_SSP_STATUS(host)) & -======= if (enable && readl(ssp->base + HW_SSP_STATUS(ssp)) & ->>>>>>> linux-next/akpm-base BM_SSP_STATUS_SDIO_IRQ) mmc_signal_sdio_irq(host->mmc); diff -puN sound/pci/hda/hda_codec.c~linux-next-git-rejects sound/pci/hda/hda_codec.c --- a/sound/pci/hda/hda_codec.c~linux-next-git-rejects +++ a/sound/pci/hda/hda_codec.c @@ -1222,11 +1222,7 @@ static void snd_hda_codec_free(struct hd static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec, hda_nid_t fg, unsigned int power_state); -<<<<<<< HEAD -static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, -======= static unsigned int hda_set_power_state(struct hda_codec *codec, ->>>>>>> linux-next/akpm-base unsigned int power_state); /** @@ -1336,10 +1332,6 @@ int /*__devinit*/ snd_hda_codec_new(stru AC_VERB_GET_SUBSYSTEM_ID, 0); } -<<<<<<< HEAD - codec->epss = snd_hda_codec_get_supported_ps(codec, - codec->afg ? codec->afg : codec->mfg, -======= #ifdef CONFIG_PM codec->d3_stop_clk = snd_hda_codec_get_supported_ps(codec, fg, AC_PWRST_CLKSTOP); @@ -1347,7 +1339,6 @@ int /*__devinit*/ snd_hda_codec_new(stru bus->power_keep_link_on = 1; #endif codec->epss = snd_hda_codec_get_supported_ps(codec, fg, ->>>>>>> linux-next/akpm-base AC_PWRST_EPSS); /* power-up all before initialization */ diff -puN sound/pci/hda/hda_codec.h~linux-next-git-rejects sound/pci/hda/hda_codec.h --- a/sound/pci/hda/hda_codec.h~linux-next-git-rejects +++ a/sound/pci/hda/hda_codec.h @@ -865,11 +865,7 @@ struct hda_codec { unsigned int no_jack_detect:1; /* Machine has no jack-detection */ unsigned int pcm_format_first:1; /* PCM format must be set first */ unsigned int epss:1; /* supporting EPSS? */ -<<<<<<< HEAD -#ifdef CONFIG_SND_HDA_POWER_SAVE -======= #ifdef CONFIG_PM ->>>>>>> linux-next/akpm-base unsigned int power_on :1; /* current (global) power-state */ unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ unsigned int pm_down_notified:1; /* PM notified to controller */ _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch audith-replace-defines-with-c-stubs.patch thermal-add-generic-cpufreq-cooling-implementation.patch thermal-exynos5-add-exynos5-thermal-sensor-driver-support.patch thermal-exynos-register-the-tmu-sensor-with-the-kernel-thermal-layer.patch mm.patch x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix.patch mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix.patch mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix.patch mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix.patch mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix.patch mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix.patch rbtree-performance-and-correctness-test-fix.patch mm-support-migrate_discard-fix.patch mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock-fix.patch backlight-add-backlight-driver-for-lm3630-chip-fix.patch backlight-add-new-lm3639-backlight-driver-fix.patch lib-parserc-avoid-overflow-in-match_number-fix.patch drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix.patch drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes.patch rtc-add-dallas-ds2404-driver-fix.patch rtc-snvs-add-freescale-rtc-snvs-driver-fix.patch fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix.patch fat-simplify-writeback_inode-checkpatch-fixes.patch fat-simplify-writeback_inode-checkpatch-fixes-fix.patch proc-use-kzalloc-instead-of-kmalloc-and-memset-fix.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch