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/process/submit-checklist.rst 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/i915/i915_drv.h | 4
drivers/gpu/drm/i915/i915_gem.c | 16 --
drivers/gpu/drm/i915/intel_engine_cs.c | 4
drivers/gpu/drm/i915/intel_lrc.c | 15 --
drivers/gpu/drm/i915/intel_ringbuffer.h | 4
drivers/gpu/drm/i915/intel_workarounds.c | 124 ------------------
drivers/gpu/drm/i915/intel_workarounds.h | 27 ---
drivers/mmc/host/sdhci-omap.c | 3
sound/firewire/fireface/ff-protocol-ff400.c | 69 ----------
sound/pci/hda/patch_realtek.c | 6
10 files changed, 272 deletions(-)
--- a/drivers/gpu/drm/i915/i915_drv.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_drv.h
@@ -1639,10 +1639,6 @@ struct drm_i915_private {
int dpio_phy_iosf_port[I915_NUM_PHYS_VLV];
-<<<<<<< HEAD
- struct i915_workarounds workarounds;
-=======
->>>>>>> linux-next/akpm-base
struct i915_wa_list gt_wa_list;
struct i915_frontbuffer_tracking fb_tracking;
--- a/drivers/gpu/drm/i915/i915_gem.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/i915_gem.c
@@ -5300,26 +5300,10 @@ int i915_gem_init_hw(struct drm_i915_pri
I915_WRITE(MI_PREDICATE_RESULT_2, IS_HSW_GT3(dev_priv) ?
LOWER_SLICE_ENABLED : LOWER_SLICE_DISABLED);
-<<<<<<< HEAD
- if (HAS_PCH_NOP(dev_priv)) {
- if (IS_IVYBRIDGE(dev_priv)) {
- u32 temp = I915_READ(GEN7_MSG_CTL);
- temp &= ~(WAIT_FOR_PCH_FLR_ACK | WAIT_FOR_PCH_RESET_ACK);
- I915_WRITE(GEN7_MSG_CTL, temp);
- } else if (INTEL_GEN(dev_priv) >= 7) {
- u32 temp = I915_READ(HSW_NDE_RSTWRN_OPT);
- temp &= ~RESET_PCH_HANDSHAKE_ENABLE;
- I915_WRITE(HSW_NDE_RSTWRN_OPT, temp);
- }
- }
-
- intel_gt_apply_workarounds(dev_priv);
-=======
/* Apply the GT workarounds... */
intel_gt_apply_workarounds(dev_priv);
/* ...and determine whether they are sticking. */
intel_gt_verify_workarounds(dev_priv, "init");
->>>>>>> linux-next/akpm-base
i915_gem_init_swizzling(dev_priv);
--- a/drivers/gpu/drm/i915/intel_engine_cs.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -682,13 +682,9 @@ void intel_engine_cleanup_common(struct
i915_timeline_fini(&engine->timeline);
-<<<<<<< HEAD
- intel_wa_list_free(&engine->wa_list);
-=======
intel_wa_list_free(&engine->ctx_wa_list);
intel_wa_list_free(&engine->wa_list);
intel_wa_list_free(&engine->whitelist);
->>>>>>> linux-next/akpm-base
}
u64 intel_engine_get_active_head(const struct intel_engine_cs *engine)
--- a/drivers/gpu/drm/i915/intel_lrc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_lrc.c
@@ -1416,21 +1416,6 @@ static u32 *gen9_init_indirectctx_bb(str
batch = emit_lri(batch, lri, ARRAY_SIZE(lri));
-<<<<<<< HEAD
- /* WaClearSlmSpaceAtContextSwitch:kbl */
- /* Actual scratch location is at 128 bytes offset */
- if (IS_KBL_REVID(engine->i915, 0, KBL_REVID_A0)) {
- batch = gen8_emit_pipe_control(batch,
- PIPE_CONTROL_FLUSH_L3 |
- PIPE_CONTROL_GLOBAL_GTT_IVB |
- PIPE_CONTROL_CS_STALL |
- PIPE_CONTROL_QW_WRITE,
- i915_scratch_offset(engine->i915)
- + 2 * CACHELINE_BYTES);
- }
-
-=======
->>>>>>> linux-next/akpm-base
/* WaMediaPoolStateCmdInWABB:bxt,glk */
if (HAS_POOLED_EU(engine->i915)) {
/*
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -436,13 +436,9 @@ struct intel_engine_cs {
struct intel_hw_status_page status_page;
struct i915_ctx_workarounds wa_ctx;
-<<<<<<< HEAD
- struct i915_wa_list wa_list;
-=======
struct i915_wa_list ctx_wa_list;
struct i915_wa_list wa_list;
struct i915_wa_list whitelist;
->>>>>>> linux-next/akpm-base
u32 irq_keep_mask; /* always keep these interrupts */
u32 irq_enable_mask; /* bitmask to enable ring interrupt */
--- a/drivers/gpu/drm/i915/intel_workarounds.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_workarounds.c
@@ -49,24 +49,6 @@
*/
static void wa_init_start(struct i915_wa_list *wal, const char *name)
-<<<<<<< HEAD
-{
- wal->name = name;
-}
-
-static void wa_init_finish(struct i915_wa_list *wal)
-{
- if (!wal->count)
- return;
-
- DRM_DEBUG_DRIVER("Initialized %u %s workarounds\n",
- wal->count, wal->name);
-}
-
-static void wa_add(struct drm_i915_private *i915,
- i915_reg_t reg, const u32 mask, const u32 val)
-=======
->>>>>>> linux-next/akpm-base
{
wal->name = name;
}
@@ -621,51 +603,6 @@ int intel_engine_emit_ctx_wa(struct i915
}
static void
-<<<<<<< HEAD
-wal_add(struct i915_wa_list *wal, const struct i915_wa *wa)
-{
- const unsigned int grow = 1 << 4;
-
- GEM_BUG_ON(!is_power_of_2(grow));
-
- if (IS_ALIGNED(wal->count, grow)) { /* Either uninitialized or full. */
- struct i915_wa *list;
-
- list = kmalloc_array(ALIGN(wal->count + 1, grow), sizeof(*wa),
- GFP_KERNEL);
- if (!list) {
- DRM_ERROR("No space for workaround init!\n");
- return;
- }
-
- if (wal->list)
- memcpy(list, wal->list, sizeof(*wa) * wal->count);
-
- wal->list = list;
- }
-
- wal->list[wal->count++] = *wa;
-}
-
-static void
-wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
-{
- struct i915_wa wa = {
- .reg = reg,
- .mask = val,
- .val = _MASKED_BIT_ENABLE(val)
- };
-
- wal_add(wal, &wa);
-}
-
-static void
-wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,
- u32 val)
-{
- struct i915_wa wa = {
- .reg = reg,
-=======
wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)
{
struct i915_wa wa = {
@@ -683,16 +620,11 @@ wa_write_masked_or(struct i915_wa_list *
{
struct i915_wa wa = {
.reg = reg,
->>>>>>> linux-next/akpm-base
.mask = mask,
.val = val
};
-<<<<<<< HEAD
- wal_add(wal, &wa);
-=======
_wa_add(wal, &wa);
->>>>>>> linux-next/akpm-base
}
static void
@@ -977,62 +909,6 @@ void intel_gt_init_workarounds(struct dr
MISSING_CASE(INTEL_GEN(i915));
wa_init_finish(wal);
-<<<<<<< HEAD
-}
-
-static enum forcewake_domains
-wal_get_fw_for_rmw(struct drm_i915_private *dev_priv,
- const struct i915_wa_list *wal)
-{
- enum forcewake_domains fw = 0;
- struct i915_wa *wa;
- unsigned int i;
-
- for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
- fw |= intel_uncore_forcewake_for_reg(dev_priv,
- wa->reg,
- FW_REG_READ |
- FW_REG_WRITE);
-
- return fw;
-}
-
-static void
-wa_list_apply(struct drm_i915_private *dev_priv, const struct i915_wa_list *wal)
-{
- enum forcewake_domains fw;
- unsigned long flags;
- struct i915_wa *wa;
- unsigned int i;
-
- if (!wal->count)
- return;
-
- fw = wal_get_fw_for_rmw(dev_priv, wal);
-
- spin_lock_irqsave(&dev_priv->uncore.lock, flags);
- intel_uncore_forcewake_get__locked(dev_priv, fw);
-
- for (i = 0, wa = wal->list; i < wal->count; i++, wa++) {
- u32 val = I915_READ_FW(wa->reg);
-
- val &= ~wa->mask;
- val |= wa->val;
-
- I915_WRITE_FW(wa->reg, val);
- }
-
- intel_uncore_forcewake_put__locked(dev_priv, fw);
- spin_unlock_irqrestore(&dev_priv->uncore.lock, flags);
-
- DRM_DEBUG_DRIVER("Applied %u %s workarounds\n", wal->count, wal->name);
-}
-
-void intel_gt_apply_workarounds(struct drm_i915_private *dev_priv)
-{
- wa_list_apply(dev_priv, &dev_priv->gt_wa_list);
-=======
->>>>>>> linux-next/akpm-base
}
static enum forcewake_domains
--- a/drivers/gpu/drm/i915/intel_workarounds.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_workarounds.h
@@ -8,7 +8,6 @@
#define _I915_WORKAROUNDS_H_
#include <linux/slab.h>
-<<<<<<< HEAD
struct i915_wa {
i915_reg_t reg;
@@ -18,32 +17,6 @@ struct i915_wa {
struct i915_wa_list {
const char *name;
- struct i915_wa *list;
- unsigned int count;
-};
-
-static inline void intel_wa_list_free(struct i915_wa_list *wal)
-{
- kfree(wal->list);
- memset(wal, 0, sizeof(*wal));
-}
-
-int intel_ctx_workarounds_init(struct drm_i915_private *dev_priv);
-int intel_ctx_workarounds_emit(struct i915_request *rq);
-
-void intel_gt_init_workarounds(struct drm_i915_private *dev_priv);
-void intel_gt_apply_workarounds(struct drm_i915_private *dev_priv);
-=======
-
-struct i915_wa {
- i915_reg_t reg;
- u32 mask;
- u32 val;
-};
->>>>>>> linux-next/akpm-base
-
-struct i915_wa_list {
- const char *name;
struct i915_wa *list;
unsigned int count;
unsigned int wa_count;
--- a/drivers/mmc/host/sdhci-omap.c~linux-next-git-rejects
+++ a/drivers/mmc/host/sdhci-omap.c
@@ -295,10 +295,7 @@ static int sdhci_omap_execute_tuning(str
struct device *dev = omap_host->dev;
struct mmc_ios *ios = &mmc->ios;
u32 start_window = 0, max_window = 0;
-<<<<<<< HEAD
-=======
bool single_point_failure = false;
->>>>>>> linux-next/akpm-base
bool dcrc_was_enabled = false;
u8 cur_match, prev_match = 0;
u32 length = 0, max_len = 0;
--- a/sound/firewire/fireface/ff-protocol-ff400.c~linux-next-git-rejects
+++ a/sound/firewire/fireface/ff-protocol-ff400.c
@@ -14,75 +14,6 @@
#define FF400_ISOC_COMM_START 0x000080100508ull
#define FF400_TX_PACKET_FORMAT 0x00008010050cull
#define FF400_ISOC_COMM_STOP 0x000080100510ull
-<<<<<<< HEAD
-#define FF400_SYNC_STATUS 0x0000801c0000ull
-#define FF400_FETCH_PCM_FRAMES 0x0000801c0000ull /* For block request. */
-#define FF400_CLOCK_CONFIG 0x0000801c0004ull
-
-#define FF400_MIDI_HIGH_ADDR 0x0000801003f4ull
-#define FF400_MIDI_RX_PORT_0 0x000080180000ull
-#define FF400_MIDI_RX_PORT_1 0x000080190000ull
-
-static int ff400_get_clock(struct snd_ff *ff, unsigned int *rate,
- enum snd_ff_clock_src *src)
-{
- __le32 reg;
- u32 data;
- int err;
-
- err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST,
- FF400_CLOCK_CONFIG, ®, sizeof(reg), 0);
- if (err < 0)
- return err;
- data = le32_to_cpu(reg);
-
- /* Calculate sampling rate. */
- switch ((data >> 1) & 0x03) {
- case 0x01:
- *rate = 32000;
- break;
- case 0x00:
- *rate = 44100;
- break;
- case 0x03:
- *rate = 48000;
- break;
- case 0x02:
- default:
- return -EIO;
- }
-
- if (data & 0x08)
- *rate *= 2;
- else if (data & 0x10)
- *rate *= 4;
-
- /* Calculate source of clock. */
- if (data & 0x01) {
- *src = SND_FF_CLOCK_SRC_INTERNAL;
- } else {
- /* TODO: 0x00, 0x01, 0x02, 0x06, 0x07? */
- switch ((data >> 10) & 0x07) {
- case 0x03:
- *src = SND_FF_CLOCK_SRC_SPDIF;
- break;
- case 0x04:
- *src = SND_FF_CLOCK_SRC_WORD;
- break;
- case 0x05:
- *src = SND_FF_CLOCK_SRC_LTC;
- break;
- case 0x00:
- default:
- *src = SND_FF_CLOCK_SRC_ADAT;
- break;
- }
- }
-
- return 0;
-}
-=======
->>>>>>> linux-next/akpm-base
static int ff400_begin_session(struct snd_ff *ff, unsigned int rate)
{
--- a/sound/pci/hda/patch_realtek.c~linux-next-git-rejects
+++ a/sound/pci/hda/patch_realtek.c
@@ -5581,10 +5581,7 @@ enum {
ALC294_FIXUP_ASUS_MIC,
ALC294_FIXUP_ASUS_HEADSET_MIC,
ALC294_FIXUP_ASUS_SPK,
-<<<<<<< HEAD
-=======
ALC225_FIXUP_HEADSET_JACK,
->>>>>>> linux-next/akpm-base
};
static const struct hda_fixup alc269_fixups[] = {
@@ -6521,13 +6518,10 @@ static const struct hda_fixup alc269_fix
.chained = true,
.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC
},
-<<<<<<< HEAD
-=======
[ALC225_FIXUP_HEADSET_JACK] = {
.type = HDA_FIXUP_FUNC,
.v.func = alc_fixup_headset_jack,
},
->>>>>>> linux-next/akpm-base
};
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slab-remove-unnecessary-unlikely-fix.patch
mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch
mm-slub-improve-performance-by-skipping-checked-node-in-get_any_partial-fix.patch
mm-page_owner-clamp-read-count-to-page_size-fix.patch
mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch
mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch
mm-lower-the-printk-loglevel-for-__dump_page-messages-fix-fix.patch
mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch
mm-memory_hotplug-be-more-verbose-for-memory-offline-failures-fix.patch
mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes.patch
mm-page_alloc-free-order-0-pages-through-pcp-in-page_frag_free-fix.patch
mm-dont-break-integrity-writeback-on-writepage-error-fix.patch
mm-use-common-iterator-for-deferred_init_pages-and-deferred_free_pages-fix.patch
mm-kmemleak-little-optimization-while-scanning-fix.patch
mm-mmu_notifier-use-structure-for-invalidate_range_start-end-callback-fix-fix.patch
mm-mmu_notifier-use-structure-for-invalidate_range_start-end-calls-v2-checkpatch-fixes.patch
filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch
filemap-drop-the-mmap_sem-for-all-blocking-operations-checkpatch-fixes.patch
mm-memory_hotplug-deobfuscate-migration-part-of-offlining-fix.patch
mm-page_alloc-enable-pcpu_drain-with-zone-capability-fix.patch
mm-migrate-provide-buffer_migrate_page_norefs-fix.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
memory_hotplug-free-pages-as-higher-order-fix-fix.patch
fs-epoll-deal-with-wait_queue-only-once-fix.patch
autofs-improve-ioctl-sbi-checks-fix.patch
exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
fs-remove-caller-signal_pending-branch-predictions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
