From: Arnd Bergmann <arnd@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: SoC Team <soc@kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL 0/6] ARM SoC branches for 5.13
Date: Tue, 27 Apr 2021 23:15:00 +0200 [thread overview]
Message-ID: <CAK8P3a23sx+M1sh2pXmb3Peuy5hV_0hy4KP7sfcXkCNXto0EMg@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=wgDQ23kEkVVhjwcVPkQCDUVmJJdhO_HtjaRRCv_mtZgag@mail.gmail.com>
On Mon, Apr 26, 2021 at 9:41 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Mon, Apr 26, 2021 at 8:53 AM Arnd Bergmann <arnd@kernel.org> wrote:
> >
> > Here are six branches for the SoC tree [...]
>
> Ok, all merged. Please do check my conflict resolutions - not because
> I think there is anything wrong there, but simply because the arm side
> doesn't get the same build coverage testing when I merge.
>
> All but the two first had some fairly trivial conflicts with the other
> trees I've been merging today.
I've inspected the merges and ran the tree through my randconfig
test box for today. It seems you fixed one merge that went wrong
in linux-next, but you missed a harmless mismerge in a DT binding
documentation file. I've applied a fix to the arm/fixes branch now
and sent it to the list [1].
Arnd
[1] https://lore.kernel.org/linux-arm-kernel/20210427210121.1080364-1-arnd@kernel.org/T/#u
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: SoC Team <soc@kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL 0/6] ARM SoC branches for 5.13
Date: Tue, 27 Apr 2021 23:15:00 +0200 [thread overview]
Message-ID: <CAK8P3a23sx+M1sh2pXmb3Peuy5hV_0hy4KP7sfcXkCNXto0EMg@mail.gmail.com> (raw)
Message-ID: <20210427211500.Nm_-jNx4XnQrG6D6pe1f56IjXVyv6CTgU9ywa0loH2k@z> (raw)
In-Reply-To: <CAHk-=wgDQ23kEkVVhjwcVPkQCDUVmJJdhO_HtjaRRCv_mtZgag@mail.gmail.com>
On Mon, Apr 26, 2021 at 9:41 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Mon, Apr 26, 2021 at 8:53 AM Arnd Bergmann <arnd@kernel.org> wrote:
> >
> > Here are six branches for the SoC tree [...]
>
> Ok, all merged. Please do check my conflict resolutions - not because
> I think there is anything wrong there, but simply because the arm side
> doesn't get the same build coverage testing when I merge.
>
> All but the two first had some fairly trivial conflicts with the other
> trees I've been merging today.
I've inspected the merges and ran the tree through my randconfig
test box for today. It seems you fixed one merge that went wrong
in linux-next, but you missed a harmless mismerge in a DT binding
documentation file. I've applied a fix to the arm/fixes branch now
and sent it to the list [1].
Arnd
[1] https://lore.kernel.org/linux-arm-kernel/20210427210121.1080364-1-arnd@kernel.org/T/#u
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-27 21:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 15:52 [GIT PULL 0/6] ARM SoC branches for 5.13 Arnd Bergmann
2021-04-26 15:52 ` Arnd Bergmann
2021-04-26 15:53 ` [GIT PULL 1/6] ARM: SoC changes for v5.13 Arnd Bergmann
2021-04-26 15:53 ` Arnd Bergmann
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 15:54 ` [GIT PULL 2/6] ARM: defconfigs " Arnd Bergmann
2021-04-26 15:54 ` Arnd Bergmann
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 15:55 ` [GIT PULL 3/6] ARM: SoC drivers " Arnd Bergmann
2021-04-26 15:55 ` Arnd Bergmann
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 15:57 ` [GIT PULL 4/6] ARM: devicetree changes for 5.13 Arnd Bergmann
2021-04-26 15:57 ` Arnd Bergmann
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 16:00 ` [GIT PULL 5/6] ARM: platform support for Nuvoton WPCM450 Arnd Bergmann
2021-04-26 16:00 ` Arnd Bergmann
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 16:05 ` [GIT PULL 6/6, look out for dependencies ] ARM: platform support for Apple M1 Arnd Bergmann
2021-04-26 16:05 ` Arnd Bergmann
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 19:42 ` pr-tracker-bot
2021-04-26 19:39 ` [GIT PULL 0/6] ARM SoC branches for 5.13 Linus Torvalds
2021-04-26 19:39 ` Linus Torvalds
2021-04-26 19:39 ` Linus Torvalds
2021-04-27 21:15 ` Arnd Bergmann [this message]
2021-04-27 21:15 ` Arnd Bergmann
2021-04-27 21:22 ` patchwork-bot+linux-soc
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=CAK8P3a23sx+M1sh2pXmb3Peuy5hV_0hy4KP7sfcXkCNXto0EMg@mail.gmail.com \
--to=arnd@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=soc@kernel.org \
--cc=torvalds@linux-foundation.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.