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>
---
include/sound/sof/header.h | 3 ---
include/uapi/sound/sof/abi.h | 4 ----
sound/soc/fsl/fsl_asrc.c | 4 ----
sound/soc/soc-core.c | 4 ----
sound/soc/sof/control.c | 4 ----
sound/soc/sof/intel/cnl.c | 4 ----
sound/soc/sof/intel/hda-ipc.c | 4 ----
sound/soc/sof/ipc.c | 8 --------
8 files changed, 35 deletions(-)
--- a/include/sound/sof/header.h~linux-next-git-rejects
+++ a/include/sound/sof/header.h
@@ -49,10 +49,7 @@
#define SOF_IPC_GLB_DAI_MSG SOF_GLB_TYPE(0x8U)
#define SOF_IPC_GLB_TRACE_MSG SOF_GLB_TYPE(0x9U)
#define SOF_IPC_GLB_GDB_DEBUG SOF_GLB_TYPE(0xAU)
-<<<<<<< HEAD
-=======
#define SOF_IPC_GLB_TEST_MSG SOF_GLB_TYPE(0xBU)
->>>>>>> linux-next/akpm-base
/*
* DSP Command Message Types
--- a/include/uapi/sound/sof/abi.h~linux-next-git-rejects
+++ a/include/uapi/sound/sof/abi.h
@@ -26,11 +26,7 @@
/* SOF ABI version major, minor and patch numbers */
#define SOF_ABI_MAJOR 3
-<<<<<<< HEAD
-#define SOF_ABI_MINOR 6
-=======
#define SOF_ABI_MINOR 8
->>>>>>> linux-next/akpm-base
#define SOF_ABI_PATCH 0
/* SOF ABI version number. Format within 32bit word is MMmmmppp */
--- a/sound/soc/fsl/fsl_asrc.c~linux-next-git-rejects
+++ a/sound/soc/fsl/fsl_asrc.c
@@ -312,11 +312,7 @@ static int fsl_asrc_config_pair(struct f
return -EINVAL;
}
-<<<<<<< HEAD
- if ((outrate >= 8000 && outrate <= 30000) &&
-=======
if ((outrate >= 5512 && outrate <= 30000) &&
->>>>>>> linux-next/akpm-base
(outrate > 24 * inrate || inrate > 8 * outrate)) {
pair_err("exceed supported ratio range [1/24, 8] for \
inrate/outrate: %d/%d\n", inrate, outrate);
--- a/sound/soc/soc-core.c~linux-next-git-rejects
+++ a/sound/soc/soc-core.c
@@ -1984,10 +1984,6 @@ static int snd_soc_instantiate_card(stru
for_each_card_prelinks(card, i, dai_link) {
ret = soc_init_dai_link(card, dai_link);
if (ret) {
-<<<<<<< HEAD
- soc_cleanup_platform(card);
-=======
->>>>>>> linux-next/akpm-base
dev_err(card->dev, "ASoC: failed to init link %s: %d\n",
dai_link->name, ret);
mutex_unlock(&client_mutex);
--- a/sound/soc/sof/control.c~linux-next-git-rejects
+++ a/sound/soc/sof/control.c
@@ -211,10 +211,6 @@ int snd_sof_bytes_put(struct snd_kcontro
struct sof_ipc_ctrl_data *cdata = scontrol->control_data;
struct sof_abi_hdr *data = cdata->data;
size_t size = data->size + sizeof(*data);
-<<<<<<< HEAD
- int ret, err;
-=======
->>>>>>> linux-next/akpm-base
if (be->max > sizeof(ucontrol->value.bytes.data)) {
dev_err_ratelimited(sdev->dev,
--- a/sound/soc/sof/intel/cnl.c~linux-next-git-rejects
+++ a/sound/soc/sof/intel/cnl.c
@@ -72,11 +72,7 @@ static irqreturn_t cnl_ipc_irq_thread(in
spin_unlock_irq(&sdev->ipc_lock);
-<<<<<<< HEAD
- ret = IRQ_HANDLED;
-=======
ipc_irq = true;
->>>>>>> linux-next/akpm-base
}
/* new message from DSP */
--- a/sound/soc/sof/intel/hda-ipc.c~linux-next-git-rejects
+++ a/sound/soc/sof/intel/hda-ipc.c
@@ -189,11 +189,7 @@ irqreturn_t hda_dsp_ipc_irq_thread(int i
spin_unlock_irq(&sdev->ipc_lock);
-<<<<<<< HEAD
- ret = IRQ_HANDLED;
-=======
ipc_irq = true;
->>>>>>> linux-next/akpm-base
}
/* is this a new message from DSP */
--- a/sound/soc/sof/ipc.c~linux-next-git-rejects
+++ a/sound/soc/sof/ipc.c
@@ -780,19 +780,11 @@ int snd_sof_ipc_valid(struct snd_sof_dev
" lock debug: %s\n"
" lock vdebug: %s\n",
v->build, v->date, v->time,
-<<<<<<< HEAD
- ready->flags & SOF_IPC_INFO_GDB ?
- "enabled" : "disabled",
- ready->flags & SOF_IPC_INFO_LOCKS ?
- "enabled" : "disabled",
- ready->flags & SOF_IPC_INFO_LOCKSV ?
-=======
(ready->flags & SOF_IPC_INFO_GDB) ?
"enabled" : "disabled",
(ready->flags & SOF_IPC_INFO_LOCKS) ?
"enabled" : "disabled",
(ready->flags & SOF_IPC_INFO_LOCKSV) ?
->>>>>>> linux-next/akpm-base
"enabled" : "disabled");
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
scripts-spellingtxt-drop-sepc-from-the-misspelling-list-fix.patch
ocfs2-add-locking-filter-debugfs-file-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
include-linux-pfn_th-remove-pfn_t_to_virt.patch
mm-swap-use-rbtree-for-swap_extent-fix.patch
mm-section-numbers-use-the-type-unsigned-long-fix.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-map_files-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix-fix.patch
byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes.patch
selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch
linux-next-rejects.patch
proc-sysctl-add-shared-variables-for-range-check-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-2-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
