diff for duplicates of <applied-20200108115007.31095-1-m.szyprowski@samsung.com>
diff --git a/a/1.txt b/N1/1.txt
index cfb1d03..3eb1a28 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ The patch
has been applied to the asoc tree at
- https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6
+ https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
@@ -25,7 +25,7 @@ to this mail.
Thanks,
Mark
-From 4e93c1294f4b051d574d6bc59755d2863286990e Mon Sep 17 00:00:00 2001
+From 1d7b051891722a36ee0b228bc940dd245f161ab1 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 8 Jan 2020 12:50:06 +0100
Subject: [PATCH] ASoC: max98090: fix incorrect helper in
@@ -72,10 +72,10 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
-index c01ce4a3f86d..ede03663cbed 100644
+index 4c7b16d557e2..c01ce4a3f86d 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
-@@ -98,7 +98,7 @@ static int max98090_put_enum_double(struct snd_kcontrol *kcontrol,
+@@ -82,7 +82,7 @@ static int max98090_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component =
diff --git a/a/content_digest b/N1/content_digest
index 93af329..08e6cd4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0Applied \"ASoC: max98090: fix incorrect helper in max98090_dapm_put_enum_double()\" to the asoc tree\0"
]
[
- "Date\0Thu, 09 Jan 2020 21:29:26 +0000\0"
+ "Date\0Thu, 09 Jan 2020 21:29:30 +0000\0"
]
[
"To\0Marek Szyprowski <m.szyprowski\@samsung.com>\0"
@@ -38,7 +38,7 @@
"\n",
"has been applied to the asoc tree at\n",
"\n",
- " https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6\n",
+ " https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git \n",
"\n",
"All being well this means that it will be integrated into the linux-next\n",
"tree (usually sometime in the next 24 hours) and sent to Linus during\n",
@@ -59,7 +59,7 @@
"Thanks,\n",
"Mark\n",
"\n",
- "From 4e93c1294f4b051d574d6bc59755d2863286990e Mon Sep 17 00:00:00 2001\n",
+ "From 1d7b051891722a36ee0b228bc940dd245f161ab1 Mon Sep 17 00:00:00 2001\n",
"From: Marek Szyprowski <m.szyprowski\@samsung.com>\n",
"Date: Wed, 8 Jan 2020 12:50:06 +0100\n",
"Subject: [PATCH] ASoC: max98090: fix incorrect helper in\n",
@@ -106,10 +106,10 @@
" 1 file changed, 1 insertion(+), 1 deletion(-)\n",
"\n",
"diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c\n",
- "index c01ce4a3f86d..ede03663cbed 100644\n",
+ "index 4c7b16d557e2..c01ce4a3f86d 100644\n",
"--- a/sound/soc/codecs/max98090.c\n",
"+++ b/sound/soc/codecs/max98090.c\n",
- "\@\@ -98,7 +98,7 \@\@ static int max98090_put_enum_double(struct snd_kcontrol *kcontrol,\n",
+ "\@\@ -82,7 +82,7 \@\@ static int max98090_dapm_put_enum_double(struct snd_kcontrol *kcontrol,\n",
" \tstruct snd_ctl_elem_value *ucontrol)\n",
" {\n",
" \tstruct snd_soc_component *component =\n",
@@ -122,4 +122,4 @@
"2.20.1"
]
-d1e6ef0a159b45bdbd8b30996df1196401a3509134ef75db80199986fa88d7b7
+3ec4984e4cfe59b544b848e2fcaa5cdaedcd0400632ea2d5695e2ad1c5537eb4
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).