Skip to contentSkip to conversation

ARM: samsung: Fixes for current cycle (v5.10)

GIT PULL Applied Krzysztof Kozlowski 2 participants 2 messages Oct 31, 2020 – Nov 13, 2020

lore
Share & tools
lore
#0 lore raw

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:

MAINTAINERS +0 -0
diff --cc MAINTAINERS
index 9bff94560b42,40b4a582b4cc..000000000000
@@@ -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 <[email protected]>
M: Krzysztof Kozlowski <[email protected]>

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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#1 lore raw

From: Arnd Bergmann <[email protected]>

Quoted 11 lines · Krzysztof Kozlowski

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
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel