All of lore.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzk@kernel.org>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	arm@kernel.org, soc@kernel.org
Cc: linux-samsung-soc@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Krzysztof Kozlowski <krzk@kernel.org>,
	linux-kernel@vger.kernel.org
Subject: [GIT PULL fixes] ARM: samsung: Fixes for current cycle (v5.10)
Date: Sat, 31 Oct 2020 13:02:37 +0100	[thread overview]
Message-ID: <20201031120237.8542-1-krzk@kernel.org> (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:


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

             reply	other threads:[~2020-10-31 12:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-31 12:02 Krzysztof Kozlowski [this message]
2020-11-13 13:29 ` [GIT PULL fixes] ARM: samsung: Fixes for current cycle (v5.10) Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201031120237.8542-1-krzk@kernel.org \
    --to=krzk@kernel.org \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=soc@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.