From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dr. Philipp Tomsich Date: Tue, 6 Jun 2017 09:21:03 +0200 Subject: [U-Boot] [PATCH 2/6] rockchip: defconfig: puma-rk3399: update defconfig with video-support In-Reply-To: References: <1496247531-1221-1-git-send-email-philipp.tomsich@theobroma-systems.com> <1496247531-1221-2-git-send-email-philipp.tomsich@theobroma-systems.com> Message-ID: <9FF11BF9-A08F-4E76-845F-7C15F652D00F@theobroma-systems.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de Simon, > On 06 Jun 2017, at 02:05, Simon Glass wrote: > > What’s the preferred way that you’d like this resolved: > (a) wait until the HDMI-changes (in Anatolij’s tree) are merged to master, before applying this patch? > (b) fix the issue in the older rk_hdmi.c (which doesn’t really have RK3399 support anyway) and deal with the conflict when the changeset from Anatolij’s tree trickled back down into the rockchip tree? > > Can you send your pending patches rebased to rockchip/master and add a new patch to add the missing header? Then it will eitherbgoba at in my rebased or be sorted out by Tom. I split this specific patch off into a new series that bundles this together with the fix for the ‘implicit definition’ warning for pre-RK3399 rk_hdmi.c. I hope that this will make tracking and resolving the eventual conflict a bit easier. Regards, Philipp.