| Message ID | pull-1571853258-16998@atomide.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL,1/2] omap2plus_defconfig changes for v5.5 | expand |
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. -Olof
* 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
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 arch/arm/configs/omap2plus_defconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)