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>
---
include/sound/soc-dapm.h | 9 -------
sound/soc/codecs/cs4265.c | 5 ----
sound/soc/codecs/rt5682.c | 4 ---
sound/soc/sh/rcar/rsnd.h | 18 --------------
sound/soc/soc-core.c | 45 ------------------------------------
sound/soc/soc-dapm.c | 18 --------------
6 files changed, 99 deletions(-)
diff -puN include/sound/soc-dapm.h~linux-next-git-rejects include/sound/soc-dapm.h
--- a/include/sound/soc-dapm.h~linux-next-git-rejects
+++ a/include/sound/soc-dapm.h
@@ -406,15 +406,6 @@ int snd_soc_dapm_new_dai_widgets(struct
struct snd_soc_dai *dai);
int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);
-<<<<<<< HEAD
-int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
- struct snd_soc_pcm_runtime *rtd,
- const struct snd_soc_pcm_stream *params,
- unsigned int num_params,
- struct snd_soc_dapm_widget *source,
- struct snd_soc_dapm_widget *sink);
-=======
->>>>>>> linux-next/akpm-base
/* dapm path setup */
int snd_soc_dapm_new_widgets(struct snd_soc_card *card);
diff -puN sound/soc/codecs/cs4265.c~linux-next-git-rejects sound/soc/codecs/cs4265.c
--- a/sound/soc/codecs/cs4265.c~linux-next-git-rejects
+++ a/sound/soc/codecs/cs4265.c
@@ -158,12 +158,7 @@ static const struct snd_kcontrol_new cs4
SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2,
3, 1, 0),
SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum),
-<<<<<<< HEAD
- SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2,
- 0, 1, 0),
-=======
SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2, 0, 1, 0),
->>>>>>> linux-next/akpm-base
SOC_ENUM("Mono Channel Select", spdif_mono_select_enum),
SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24),
};
diff -puN sound/soc/codecs/rt5682.c~linux-next-git-rejects sound/soc/codecs/rt5682.c
--- a/sound/soc/codecs/rt5682.c~linux-next-git-rejects
+++ a/sound/soc/codecs/rt5682.c
@@ -750,10 +750,6 @@ static bool rt5682_readable_register(str
}
}
-<<<<<<< HEAD
-static const DECLARE_TLV_DB_SCALE(hp_vol_tlv, -2250, 150, 0);
-=======
->>>>>>> linux-next/akpm-base
static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6525, 75, 0);
static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0);
static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);
diff -puN sound/soc/sh/rcar/rsnd.h~linux-next-git-rejects sound/soc/sh/rcar/rsnd.h
--- a/sound/soc/sh/rcar/rsnd.h~linux-next-git-rejects
+++ a/sound/soc/sh/rcar/rsnd.h
@@ -295,24 +295,12 @@ struct rsnd_mod_ops {
int (*fallback)(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv);
-<<<<<<< HEAD
- int (*nolock_start)(struct rsnd_mod *mod,
- struct rsnd_dai_stream *io,
- struct rsnd_priv *priv);
- int (*nolock_stop)(struct rsnd_mod *mod,
- struct rsnd_dai_stream *io,
- struct rsnd_priv *priv);
- int (*prepare)(struct rsnd_mod *mod,
- struct rsnd_dai_stream *io,
- struct rsnd_priv *priv);
-=======
int (*prepare)(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv);
int (*cleanup)(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv);
->>>>>>> linux-next/akpm-base
};
struct rsnd_dai_stream;
@@ -387,12 +375,6 @@ struct rsnd_mod {
#define __rsnd_mod_call_fallback 0
#define __rsnd_mod_call_hw_params 0
#define __rsnd_mod_call_pointer 0
-<<<<<<< HEAD
-#define __rsnd_mod_call_nolock_start 0
-#define __rsnd_mod_call_nolock_stop 1
-#define __rsnd_mod_call_prepare 0
-=======
->>>>>>> linux-next/akpm-base
#define rsnd_mod_to_priv(mod) ((mod)->priv)
#define rsnd_mod_name(mod) ((mod)->ops->name)
diff -puN sound/soc/soc-core.c~linux-next-git-rejects sound/soc/soc-core.c
--- a/sound/soc/soc-core.c~linux-next-git-rejects
+++ a/sound/soc/soc-core.c
@@ -1465,51 +1465,6 @@ static int soc_link_dai_pcm_new(struct s
return 0;
}
-<<<<<<< HEAD
-static int soc_link_dai_widgets(struct snd_soc_card *card,
- struct snd_soc_dai_link *dai_link,
- struct snd_soc_pcm_runtime *rtd)
-{
- struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
- struct snd_soc_dai *codec_dai = rtd->codec_dai;
- struct snd_soc_dapm_widget *sink, *source;
- int ret;
-
- if (rtd->num_codecs > 1)
- dev_warn(card->dev, "ASoC: Multiple codecs not supported yet\n");
-
- /* link the DAI widgets */
- sink = codec_dai->playback_widget;
- source = cpu_dai->capture_widget;
- if (sink && source) {
- ret = snd_soc_dapm_new_pcm(card, rtd, dai_link->params,
- dai_link->num_params,
- source, sink);
- if (ret != 0) {
- dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
- sink->name, source->name, ret);
- return ret;
- }
- }
-
- sink = cpu_dai->playback_widget;
- source = codec_dai->capture_widget;
- if (sink && source) {
- ret = snd_soc_dapm_new_pcm(card, rtd, dai_link->params,
- dai_link->num_params,
- source, sink);
- if (ret != 0) {
- dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
- sink->name, source->name, ret);
- return ret;
- }
- }
-
- return 0;
-}
-
-=======
->>>>>>> linux-next/akpm-base
static int soc_probe_link_dais(struct snd_soc_card *card,
struct snd_soc_pcm_runtime *rtd, int order)
{
diff -puN sound/soc/soc-dapm.c~linux-next-git-rejects sound/soc/soc-dapm.c
--- a/sound/soc/soc-dapm.c~linux-next-git-rejects
+++ a/sound/soc/soc-dapm.c
@@ -3617,11 +3617,7 @@ static int snd_soc_dai_link_event(struct
struct snd_soc_dapm_path *path;
struct snd_soc_dai *source, *sink;
struct snd_soc_pcm_runtime *rtd = w->priv;
-<<<<<<< HEAD
- const struct snd_soc_pcm_stream *config = w->params + w->params_select;
-=======
const struct snd_soc_pcm_stream *config;
->>>>>>> linux-next/akpm-base
struct snd_pcm_substream substream;
struct snd_pcm_hw_params *params = NULL;
struct snd_pcm_runtime *runtime = NULL;
@@ -3888,19 +3884,10 @@ outfree_w_param:
return NULL;
}
-<<<<<<< HEAD
-int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
- struct snd_soc_pcm_runtime *rtd,
- const struct snd_soc_pcm_stream *params,
- unsigned int num_params,
- struct snd_soc_dapm_widget *source,
- struct snd_soc_dapm_widget *sink)
-=======
static struct snd_soc_dapm_widget *
snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd,
struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink)
->>>>>>> linux-next/akpm-base
{
struct snd_soc_dapm_widget template;
struct snd_soc_dapm_widget *w;
@@ -3955,11 +3942,6 @@ snd_soc_dapm_new_dai(struct snd_soc_card
goto outfree_kcontrol_news;
}
-<<<<<<< HEAD
- w->params = params;
- w->num_params = num_params;
-=======
->>>>>>> linux-next/akpm-base
w->priv = rtd;
return w;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
proc-kcore-fix-invalid-memory-access-in-multi-page-read-optimization-v3-fix.patch
fix-crash-on-ocfs2_duplicate_clusters_by_page-v5-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch
mm.patch
mmpage_alloc-pf_wq_worker-threads-must-sleep-at-should_reclaim_retry-fix.patch
sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
