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>
---
arch/x86/events/perf_event.h | 3 --
arch/x86/kernel/cpu/intel.c | 33 ----------------------------
drivers/iio/industrialio-buffer.c | 5 ----
drivers/misc/fastrpc.c | 7 -----
drivers/tty/serial/sc16is7xx.c | 3 --
5 files changed, 51 deletions(-)
--- a/arch/x86/events/perf_event.h~linux-next-git-rejects
+++ a/arch/x86/events/perf_event.h
@@ -120,8 +120,6 @@ struct amd_nb {
(1ULL << PERF_REG_X86_R13) | \
(1ULL << PERF_REG_X86_R14) | \
(1ULL << PERF_REG_X86_R15))
-<<<<<<< HEAD
-=======
#define PEBS_XMM_REGS \
((1ULL << PERF_REG_X86_XMM0) | \
@@ -140,7 +138,6 @@ struct amd_nb {
(1ULL << PERF_REG_X86_XMM13) | \
(1ULL << PERF_REG_X86_XMM14) | \
(1ULL << PERF_REG_X86_XMM15))
->>>>>>> linux-next/akpm-base
/*
* Per register state.
--- a/arch/x86/kernel/cpu/intel.c~linux-next-git-rejects
+++ a/arch/x86/kernel/cpu/intel.c
@@ -596,39 +596,6 @@ detect_keyid_bits:
c->x86_phys_bits -= keyid_bits;
}
-<<<<<<< HEAD
-static void init_intel_energy_perf(struct cpuinfo_x86 *c)
-{
- u64 epb;
-
- /*
- * Initialize MSR_IA32_ENERGY_PERF_BIAS if not already initialized.
- * (x86_energy_perf_policy(8) is available to change it at run-time.)
- */
- if (!cpu_has(c, X86_FEATURE_EPB))
- return;
-
- rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
- if ((epb & 0xF) != ENERGY_PERF_BIAS_PERFORMANCE)
- return;
-
- pr_info_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");
- pr_info_once("ENERGY_PERF_BIAS: View and update with x86_energy_perf_policy(8)\n");
- epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;
- wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
-}
-
-static void intel_bsp_resume(struct cpuinfo_x86 *c)
-{
- /*
- * MSR_IA32_ENERGY_PERF_BIAS is lost across suspend/resume,
- * so reinitialize it properly like during bootup:
- */
- init_intel_energy_perf(c);
-}
-
-=======
->>>>>>> linux-next/akpm-base
static void init_cpuid_fault(struct cpuinfo_x86 *c)
{
u64 msr;
--- a/drivers/iio/industrialio-buffer.c~linux-next-git-rejects
+++ a/drivers/iio/industrialio-buffer.c
@@ -320,12 +320,7 @@ static int iio_scan_mask_set(struct iio_
const unsigned long *mask;
unsigned long *trialmask;
-<<<<<<< HEAD
- trialmask = kcalloc(BITS_TO_LONGS(indio_dev->masklength),
- sizeof(*trialmask), GFP_KERNEL);
-=======
trialmask = bitmap_zalloc(indio_dev->masklength, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
if (trialmask == NULL)
return -ENOMEM;
if (!indio_dev->masklength) {
--- a/drivers/misc/fastrpc.c~linux-next-git-rejects
+++ a/drivers/misc/fastrpc.c
@@ -1315,10 +1315,7 @@ static int fastrpc_cb_probe(struct platf
struct device *dev = &pdev->dev;
int i, sessions = 0;
int rc;
-<<<<<<< HEAD
-=======
unsigned long flags;
->>>>>>> linux-next/akpm-base
cctx = dev_get_drvdata(dev->parent);
if (!cctx)
@@ -1347,11 +1344,7 @@ static int fastrpc_cb_probe(struct platf
}
}
cctx->sesscount++;
-<<<<<<< HEAD
- spin_unlock(&cctx->lock);
-=======
spin_unlock_irqrestore(&cctx->lock, flags);
->>>>>>> linux-next/akpm-base
rc = dma_set_mask(dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(dev, "32-bit DMA enable failed\n");
--- a/drivers/tty/serial/sc16is7xx.c~linux-next-git-rejects
+++ a/drivers/tty/serial/sc16is7xx.c
@@ -1525,11 +1525,8 @@ err_spi:
#endif
#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
i2c_del_driver(&sc16is7xx_i2c_uart_driver);
-<<<<<<< HEAD
-=======
#endif
#endif
->>>>>>> linux-next/akpm-base
err_i2c:
#endif
uart_unregister_driver(&sc16is7xx_uart);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
slab-fix-an-infinite-loop-in-leaks_show-fix.patch
userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch
mm-compaction-fix-an-undefined-behaviour-fix.patch
mm-enable-error-injection-at-add_to_page_cache-fix.patch
mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
mm-add-probe_user_read-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
lib-list_sort-simplify-and-remove-max_list_length_bits-fix.patch
lib-test_vmallocc-test_func-eliminate-local-ret.patch
fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch
cpumask-fix-double-string-traverse-in-cpumask_parse-fix.patch
convert-struct-pid-count-to-refcount_t-fix.patch
gcov-clang-support-checkpatch-fixes.patch
ipc-do-cyclic-id-allocation-for-the-ipc-object-fix.patch
linux-next-rejects.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
