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 <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/i915_drv.c | 4 ----
sound/pci/hda/patch_hdmi.c | 22 ----------------------
2 files changed, 26 deletions(-)
--- a/drivers/gpu/drm/i915/i915_drv.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_drv.c
@@ -297,11 +297,7 @@ static int i915_driver_modeset_probe(str
if (ret)
goto cleanup_vga_client;
-<<<<<<< HEAD
- intel_power_domains_init_hw(dev_priv, false);
-=======
intel_power_domains_init_hw(i915, false);
->>>>>>> linux-next/akpm-base
intel_csr_ucode_init(i915);
--- a/sound/pci/hda/patch_hdmi.c~linux-next-git-rejects
+++ a/sound/pci/hda/patch_hdmi.c
@@ -37,28 +37,6 @@ static bool static_hdmi_pcm;
module_param(static_hdmi_pcm, bool, 0644);
MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");
-<<<<<<< HEAD
-#define is_haswell(codec) ((codec)->core.vendor_id == 0x80862807)
-#define is_broadwell(codec) ((codec)->core.vendor_id == 0x80862808)
-#define is_skylake(codec) ((codec)->core.vendor_id == 0x80862809)
-#define is_broxton(codec) ((codec)->core.vendor_id == 0x8086280a)
-#define is_kabylake(codec) ((codec)->core.vendor_id == 0x8086280b)
-#define is_geminilake(codec) (((codec)->core.vendor_id == 0x8086280d) || \
- ((codec)->core.vendor_id == 0x80862800))
-#define is_cannonlake(codec) ((codec)->core.vendor_id == 0x8086280c)
-#define is_icelake(codec) ((codec)->core.vendor_id == 0x8086280f)
-#define is_tigerlake(codec) ((codec)->core.vendor_id == 0x80862812)
-#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec) \
- || is_skylake(codec) || is_broxton(codec) \
- || is_kabylake(codec) || is_geminilake(codec) \
- || is_cannonlake(codec) || is_icelake(codec) \
- || is_tigerlake(codec))
-#define is_valleyview(codec) ((codec)->core.vendor_id == 0x80862882)
-#define is_cherryview(codec) ((codec)->core.vendor_id == 0x80862883)
-#define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec))
-
-=======
->>>>>>> linux-next/akpm-base
struct hdmi_spec_per_cvt {
hda_nid_t cvt_nid;
int assigned;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-swap-disallow-swapon-on-zoned-block-devices-fix.patch
rss_stat-add-support-to-detect-rss-updates-of-external-mm-fix.patch
mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch
memfd-fix-cow-issue-on-map_private-and-f_seal_future_write-mappings-fix.patch
mm-vmscan-simplify-lruvec_lru_size-fix-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
hugetlb-remove-duplicated-code-checkpatch-fixes.patch
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch
mm-madvise-replace-with-page_size-in-madvise_inject_error-fix.patch
mm-annotate-refault-stalls-from-swap_readpage-fix.patch
lib-optimize-cpumask_local_spread-v3-fix.patch
usb-kcov-collect-coverage-from-hub_event-fix.patch
linux-next-rejects.patch
diff-sucks.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
bitops-introduce-the-for_each_set_clump8-macro-fix-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
