linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: SoC Team <soc@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL 3/4] ARM: defconfig updates
Date: Fri, 3 Apr 2020 15:17:19 -0700	[thread overview]
Message-ID: <CAHk-=wgtkiTh+M55onqQJ7TdBvTnAzHFNG77NmsBsDMyV82OQw@mail.gmail.com> (raw)
In-Reply-To: <CAK8P3a3OPgCzLxzd=7Ng=jregKB0HycLLrfA4xYd7-4Te-kHMA@mail.gmail.com>

On Fri, Apr 3, 2020 at 2:36 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
> tags/arm-defconfig-5.7

This caused a conflict in 'omap2plus_defconfig'.

I resolved it, but honestly, I couldn't find it in myself to care that
deeply about a defconfig conflict.

So I think somebody might want to check it and maybe re-generate that
thing if it matter.

                 Linus

  reply	other threads:[~2020-04-03 22:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-03 21:29 [GIT PULL 0/4] ARM: SoC changes for v5.7 Arnd Bergmann
2020-04-03 21:32 ` [GIT PULL 1/4] ARM: SoC updates Arnd Bergmann
2020-04-03 21:35 ` [GIT PULL 2/4] ARM: driver updates Arnd Bergmann
2020-04-03 21:36 ` [GIT PULL 3/4] ARM: defconfig updates Arnd Bergmann
2020-04-03 22:17   ` Linus Torvalds [this message]
2020-04-03 21:45 ` [GIT PULL 4/4] ARM: devicetree updates Arnd Bergmann
2020-04-03 22:27   ` Linus Torvalds
2020-04-04 10:03     ` 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='CAHk-=wgtkiTh+M55onqQJ7TdBvTnAzHFNG77NmsBsDMyV82OQw@mail.gmail.com' \
    --to=torvalds@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --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 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).