* drm/edid: sound/core: pcm_drm_eld.c compilation error in 4.2 @ 2015-07-16 16:16 Jean-Francois Moine 2015-07-16 16:46 ` Russell King - ARM Linux 0 siblings, 1 reply; 3+ messages in thread From: Jean-Francois Moine @ 2015-07-16 16:16 UTC (permalink / raw) To: linux-arm-kernel The file sound/core/pcm_drm_eld.c which was added by the commit 838d1631b766529213684f07dd71cdf2e92f0623 ALSA: pcm: add DRM ELD helper lacks the function drm_eld_sad() which was defined by Russell's patch http://article.gmane.org/gmane.linux.ports.arm.kernel/411574 drm/edid: add function to help find SADs This patch has not been applied. -- Ken ar c'henta? | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* drm/edid: sound/core: pcm_drm_eld.c compilation error in 4.2 2015-07-16 16:16 drm/edid: sound/core: pcm_drm_eld.c compilation error in 4.2 Jean-Francois Moine @ 2015-07-16 16:46 ` Russell King - ARM Linux 2015-07-17 10:45 ` Takashi Iwai 0 siblings, 1 reply; 3+ messages in thread From: Russell King - ARM Linux @ 2015-07-16 16:46 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jul 16, 2015 at 06:16:58PM +0200, Jean-Francois Moine wrote: > The file sound/core/pcm_drm_eld.c which was added by the commit > > 838d1631b766529213684f07dd71cdf2e92f0623 > ALSA: pcm: add DRM ELD helper > > lacks the function drm_eld_sad() which was defined by Russell's patch > > http://article.gmane.org/gmane.linux.ports.arm.kernel/411574 > drm/edid: add function to help find SADs > > This patch has not been applied. Grr, that's the danger of trying to split changes which cross between subsystems. I hate todays fragmented nature of kernel development, it's really a nightmare. I'm not sure how this can be resolved now, I asked Dave Airlie to pull the next set of patches which include the one adding the SAD helper; he's probably already pulled that for -next, so to pull out just that patch and try to get it merged into -rc is going to be far from nice, and will probably introduce conflicts. -- FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net. ^ permalink raw reply [flat|nested] 3+ messages in thread
* drm/edid: sound/core: pcm_drm_eld.c compilation error in 4.2 2015-07-16 16:46 ` Russell King - ARM Linux @ 2015-07-17 10:45 ` Takashi Iwai 0 siblings, 0 replies; 3+ messages in thread From: Takashi Iwai @ 2015-07-17 10:45 UTC (permalink / raw) To: linux-arm-kernel On Thu, 16 Jul 2015 18:46:43 +0200, Russell King - ARM Linux wrote: > > On Thu, Jul 16, 2015 at 06:16:58PM +0200, Jean-Francois Moine wrote: > > The file sound/core/pcm_drm_eld.c which was added by the commit > > > > 838d1631b766529213684f07dd71cdf2e92f0623 > > ALSA: pcm: add DRM ELD helper > > > > lacks the function drm_eld_sad() which was defined by Russell's patch > > > > http://article.gmane.org/gmane.linux.ports.arm.kernel/411574 > > drm/edid: add function to help find SADs > > > > This patch has not been applied. > > Grr, that's the danger of trying to split changes which cross between > subsystems. I hate todays fragmented nature of kernel development, > it's really a nightmare. > > I'm not sure how this can be resolved now, I asked Dave Airlie to pull > the next set of patches which include the one adding the SAD helper; > he's probably already pulled that for -next, so to pull out just that > patch and try to get it merged into -rc is going to be far from nice, > and will probably introduce conflicts. Oh, that's bad that the DRM part slipped from 4.2 merge. OTOH, the commit in sound side adds a code enabled only when a new Kconfig is set, and currently there is no one setting this Kconfig. (and it's no selectable). So there should be no breakage as of now. thanks, Takashi ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-17 10:45 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-16 16:16 drm/edid: sound/core: pcm_drm_eld.c compilation error in 4.2 Jean-Francois Moine 2015-07-16 16:46 ` Russell King - ARM Linux 2015-07-17 10:45 ` Takashi Iwai
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).