From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D483CA9EB9 for ; Wed, 23 Oct 2019 21:20:16 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB96621BE5 for ; Wed, 23 Oct 2019 21:20:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AFwWmQsN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB96621BE5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3y1q9tq991badSzptQvcrgnCJUscbTxpmhQt+N3yjZs=; b=AFwWmQsNYBZnlt 9Ut4BanfaSvy+8lmILmbNH1m1nFO01ukASUPmcdfuhbYghSWH2oaAPOmMubkb7v4Ak80vPhkfimAE BiSKLXh5nxiDfHx3GvXYKVcs7fA8jN5QmgmTpXpQNUF7M5QKdRIskk1BCITRG4Lahf6rVmo3Bbeab SSg/b608US6Z+KpMe+SuSJzcSPB3oDQ3jk+8BbpthSBUr0wJfBaz2wJjZImfK/+TrBU+i2hMb9VU6 pRP3U5m603rE/CKcV1XhSYd5AkFg1Cv32/mhYrXz+H45b43BGl7a8sfls+518Sd0gg59OAqTjOHst J+BTtSCOZRiGABJEzbKA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNO2z-00069x-BS; Wed, 23 Oct 2019 21:20:01 +0000 Received: from muru.com ([72.249.23.125]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNO2v-000699-Jn for linux-arm-kernel@lists.infradead.org; Wed, 23 Oct 2019 21:19:58 +0000 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 8D41080CF; Wed, 23 Oct 2019 21:20:26 +0000 (UTC) Date: Wed, 23 Oct 2019 14:19:48 -0700 From: Tony Lindgren To: Olof Johansson Subject: Re: [GIT PULL 1/2] omap2plus_defconfig changes for v5.5 Message-ID: <20191023211948.GS5610@atomide.com> References: <20191023202247.wb2jzwvek7u5korx@localhost> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191023202247.wb2jzwvek7u5korx@localhost> User-Agent: Mutt/1.12.1 (2019-06-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191023_141957_695133_A7956792 X-CRM114-Status: GOOD ( 13.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: soc@kernel.org, arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org * Olof Johansson [191023 20:28]: > On Wed, Oct 23, 2019 at 10:54:48AM -0700, Tony Lindgren wrote: > > From: "Tony Lindgren" > > > > 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