Date: Sat, 8 Aug 2015 16:13:10 +0100
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Lucas Stach <l.stach@pengutronix.de>, Thierry Reding <treding@nvidia.com>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] drm: bridge/dw_hdmi: Cache edid data
Message-ID: <20150808151310.GA4644@n2100.arm.linux.org.uk>
References: <1438955961-27232-1-git-send-email-s.hauer@pengutronix.de>
 <1438955961-27232-2-git-send-email-s.hauer@pengutronix.de>
 <20150807141346.GH7557@n2100.arm.linux.org.uk>
 <1438957247.2467.17.camel@pengutronix.de>
 <20150807224028.GI7557@n2100.arm.linux.org.uk>
 <20150808133540.GA934@n2100.arm.linux.org.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150808133540.GA934@n2100.arm.linux.org.uk>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1651
Lines: 33

On Sat, Aug 08, 2015 at 02:35:40PM +0100, Russell King - ARM Linux wrote:
> I have a whole bunch of further patches for dw-hdmi, so if you don't
> mind, I'll take your two, merge them on the front of my series, and
> re-post them.  I think we're getting close to the time where we can
> see initial audio support merged for dw-hdmi.

Having tried to apply the patches on top of my previous pull request to
David (sent on 15th July), it would be much better if we waited.  David
is away at the moment, apparently due back in a little over a week's time.
Hence, there's no processing of any development pull requests at the
moment, which is why it hasn't shown up in linux-next.

My series is based on 9203dd016a5d ("ALSA: pcm: add IEC958 channel status
helper") which pre-dates the fixes to get_modes() to return non-zero,
which are already in Linus' tree.  I _could_ rebase it, but that's not
good practice once it's been asked to be pulled.

At the moment, my tree does not introduce any conflicts.

Trying to merge your patch will create conflicts: if I merge the fix into
my tree, we end up with duplicate commits.  If I tweak your patch to
apply to my tree as the code used to stand, git will end up with two
conflicting changes.  If I merge mainline into my tree, Linus doesn't
like cross-merges.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/