From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH v2] drm/i915: HDMI - Clear Audio Enable bit for Hot Plug unconditionally Date: Thu, 13 Sep 2012 16:31:05 +0200 Message-ID: References: <1347506340-2683-1-git-send-email-xingchao.wang@intel.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Daniel Vetter Cc: alsa-devel@alsa-project.org, Greg KH , intel-gfx@lists.freedesktop.org, Wang Xingchao , yakui.zhao@intel.com, stable@vger.kernel.org, michael.fu@intel.com, fengguang.wu@intel.com, Wang Xingchao List-Id: intel-gfx@lists.freedesktop.org At Thu, 13 Sep 2012 16:18:08 +0200, Daniel Vetter wrote: > > On Thu, Sep 13, 2012 at 4:00 PM, Takashi Iwai wrote: > > But, this makes me wonder why this patch can't go into 3.6. It's a > > clear bug and the fix is trivial. > > > > Daniel, isn't it better to pick the fix (for 3.6) to drm-intel-fixes, > > then merge back to drm-intel-next? > > Well, on a quick read-through it didn't sound serious (just a bit of > noise in dmesg and a few spurious reconfigs), For the graphics side, yes. But for the sound driver side, you'll miss the jack-detection unplug event without this fix. > and we're rather late in > the -rc cycle. Yes, but a bug is a bug is a bug :) And the fix is two-liners. If there were no conflict, would you mind it? I don't think so. > Applying this on top of -fixes will cause a conflict, so didn't looked > like I should bother. Yeah, that's bad. > Also, I _want_ the patch for -next so that git > blame shows the commit and not some random conflicting merge. With parallel development, you can't always get straight lines, as you know well... Takashi