From: Tony Lindgren <tony@atomide.com>
To: Olof Johansson <olof@lixom.net>
Cc: soc@kernel.org, arm@kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL 1/2] omap2plus_defconfig changes for v5.5
Date: Wed, 23 Oct 2019 14:19:48 -0700 [thread overview]
Message-ID: <20191023211948.GS5610@atomide.com> (raw)
In-Reply-To: <20191023202247.wb2jzwvek7u5korx@localhost>
* Olof Johansson <olof@lixom.net> [191023 20:28]:
> On Wed, Oct 23, 2019 at 10:54:48AM -0700, Tony Lindgren wrote:
> > From: "Tony Lindgren" <tony@atomide.com>
> >
> > The following changes since commit 96d49bbfe6c1a6bb43ccd00fb87aca100e32e5e2:
> >
> > ARM: omap2plus_defconfig: Fix selected panels after generic panel changes (2019-10-03 09:44:40 -0700)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.5/defconfig-signed
> >
> > for you to fetch changes up to ec2b31267263cd7d5a7567d315f839796c2a8c87:
> >
> > configs: omap2plus: Enable VIDEO_MT9P031 module (2019-10-22 09:11:03 -0700)
> >
> > ----------------------------------------------------------------
> > Defconfig changes for omap2plus_defconfig for v5.5
> >
> > A series of changes from Adam Ford to update for removed and moved items,
> > and then enable crypto devices and MT9P031 video as loadable modules.
> >
> > Looks like I missed unifying the subject line for one commit, but I did
> > not want to mess with the commit after pushing it out.
> >
> > ----------------------------------------------------------------
> > Adam Ford (4):
> > ARM: omap2plus_defconfig: Update for removed items
> > ARM: omap2plus_defconfig: Update for moved item
> > ARM: omap2plus_defconfig: Enable HW Crypto engine modules
> > configs: omap2plus: Enable VIDEO_MT9P031 module
>
> Looks like this branch had a minor conflict with one of your fixes branches.
> Easy to patch up, but feel free to use your fixes as a base for the topics if
> needed.
Oh sorry, I thought I did that. But sounds like I also had
some additional merge resolve in my for-next.
Thanks,
Tony
WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com>
To: Olof Johansson <olof@lixom.net>
Cc: soc@kernel.org, arm@kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [GIT PULL 1/2] omap2plus_defconfig changes for v5.5
Date: Wed, 23 Oct 2019 14:19:48 -0700 [thread overview]
Message-ID: <20191023211948.GS5610@atomide.com> (raw)
In-Reply-To: <20191023202247.wb2jzwvek7u5korx@localhost>
* Olof Johansson <olof@lixom.net> [191023 20:28]:
> On Wed, Oct 23, 2019 at 10:54:48AM -0700, Tony Lindgren wrote:
> > From: "Tony Lindgren" <tony@atomide.com>
> >
> > The following changes since commit 96d49bbfe6c1a6bb43ccd00fb87aca100e32e5e2:
> >
> > ARM: omap2plus_defconfig: Fix selected panels after generic panel changes (2019-10-03 09:44:40 -0700)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.5/defconfig-signed
> >
> > for you to fetch changes up to ec2b31267263cd7d5a7567d315f839796c2a8c87:
> >
> > configs: omap2plus: Enable VIDEO_MT9P031 module (2019-10-22 09:11:03 -0700)
> >
> > ----------------------------------------------------------------
> > Defconfig changes for omap2plus_defconfig for v5.5
> >
> > A series of changes from Adam Ford to update for removed and moved items,
> > and then enable crypto devices and MT9P031 video as loadable modules.
> >
> > Looks like I missed unifying the subject line for one commit, but I did
> > not want to mess with the commit after pushing it out.
> >
> > ----------------------------------------------------------------
> > Adam Ford (4):
> > ARM: omap2plus_defconfig: Update for removed items
> > ARM: omap2plus_defconfig: Update for moved item
> > ARM: omap2plus_defconfig: Enable HW Crypto engine modules
> > configs: omap2plus: Enable VIDEO_MT9P031 module
>
> Looks like this branch had a minor conflict with one of your fixes branches.
> Easy to patch up, but feel free to use your fixes as a base for the topics if
> needed.
Oh sorry, I thought I did that. But sounds like I also had
some additional merge resolve in my for-next.
Thanks,
Tony
_______________________________________________
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:[~2019-10-23 21:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 17:54 [GIT PULL 1/2] omap2plus_defconfig changes for v5.5 Tony Lindgren
2019-10-23 17:54 ` Tony Lindgren
2019-10-23 17:54 ` [GIT PULL 2/2] ti-sysc driver " Tony Lindgren
2019-10-23 17:54 ` Tony Lindgren
2019-10-23 20:22 ` [GIT PULL 1/2] omap2plus_defconfig " Olof Johansson
2019-10-23 20:22 ` Olof Johansson
2019-10-23 21:19 ` Tony Lindgren [this message]
2019-10-23 21:19 ` Tony Lindgren
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=20191023211948.GS5610@atomide.com \
--to=tony@atomide.com \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@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.