* [GIT PULL fixes] ARM: samsung: Fixes for current cycle (v5.10)
@ 2020-10-31 12:02 Krzysztof Kozlowski
2020-11-13 13:29 ` Arnd Bergmann
0 siblings, 1 reply; 2+ messages in thread
From: Krzysztof Kozlowski @ 2020-10-31 12:02 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, arm, soc
Cc: linux-samsung-soc, linux-arm-kernel, Krzysztof Kozlowski, linux-kernel
Hi,
Few patches for the current cycle - as fixes, altough these are not really
fixes for anything.
Expected conflict on arm-soc side:
421f2597bf42 ("MAINTAINERS: Move Kukjin Kim to credits")
from the arm-soc-fixes tree and commit:
215f06d7efc2 ("MAINTAINERS: move Kyungmin Park to credits")
from the samsung-krzk-fixes tree.
Resolution is to accept both:
diff --cc MAINTAINERS
index 9bff94560b42,40b4a582b4cc..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2374,7 -2374,8 +2374,7 @@@ F: drivers/i2c/busses/i2c-rk3x.
F: sound/soc/rockchip/
N: rockchip
- ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
+ ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
-M: Kukjin Kim <kgene@kernel.org>
M: Krzysztof Kozlowski <krzk@kernel.org>
Best regards,
Krzysztof
The following changes since commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec:
Linux 5.10-rc1 (2020-10-25 15:14:11 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-fixes-5.10
for you to fetch changes up to cd12e4f14f7cca7d04fbcf0da2dc116070d7f26f:
CREDITS: remove trailing white spaces (2020-10-28 22:57:59 +0100)
----------------------------------------------------------------
Samsung changes for v5.10
Remove Kamil Debski, Kyungmin Park and Jeongtae Park from maintainers of
several drivers. There were no maintenance activities from them for
some time. While at touching credits, this also cleans up white spaces.
----------------------------------------------------------------
Krzysztof Kozlowski (4):
MAINTAINERS: move Kamil Debski to credits
MAINTAINERS: move Kyungmin Park to credits
MAINTAINERS: remove Jeongtae Park from Samsung MFC entry
CREDITS: remove trailing white spaces
CREDITS | 62 +++++++++++++++++++++++++++++++++++--------------------------
MAINTAINERS | 18 +-----------------
2 files changed, 37 insertions(+), 43 deletions(-)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [GIT PULL fixes] ARM: samsung: Fixes for current cycle (v5.10)
2020-10-31 12:02 [GIT PULL fixes] ARM: samsung: Fixes for current cycle (v5.10) Krzysztof Kozlowski
@ 2020-11-13 13:29 ` Arnd Bergmann
0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2020-11-13 13:29 UTC (permalink / raw)
To: arm, Olof Johansson, Krzysztof Kozlowski, soc
Cc: linux-arm-kernel, linux-samsung-soc, linux-kernel, Arnd Bergmann
From: Arnd Bergmann <arnd@arndb.de>
On Sat, 31 Oct 2020 13:02:37 +0100, Krzysztof Kozlowski wrote:
> Few patches for the current cycle - as fixes, altough these are not really
> fixes for anything.
>
> Expected conflict on arm-soc side:
> 421f2597bf42 ("MAINTAINERS: Move Kukjin Kim to credits")
> from the arm-soc-fixes tree and commit:
>
> 215f06d7efc2 ("MAINTAINERS: move Kyungmin Park to credits")
> from the samsung-krzk-fixes tree.
>
> [...]
Merged into arm/fixes, thanks!
merge commit: e57523fa64d6166de6e70227a3d4395233015bc8
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-13 13:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-31 12:02 [GIT PULL fixes] ARM: samsung: Fixes for current cycle (v5.10) Krzysztof Kozlowski
2020-11-13 13:29 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.