Re: [PULL] soc-camera: fix compile breakage

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Em Fri, 4 Sep 2009 21:46:09 +0200 (CEST)
Guennadi Liakhovetski <g.liakhovetski@xxxxxx> escreveu:

> Hi Mauro
> 
> Please pull from http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
> 
> for the following changeset:
> 
> 01/01: SH: fix ap325rxa compilation breakage
> http://linuxtv.org/hg/~gliakhovetski/v4l-dvb?cmd=changeset;node=375955bfb282
> 
> 
>  board-ap325rxa.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> This is the breakage we just discussed on IRC. The guilty commit in your 
> git-tree is [1]. However, the slight problem with this is, that that 
> single bad line is also modified by [2]. So, the best fix would be to 
> merge [1], the respective (very first) hunk of [2] and this patch.

OK, I did your recommended procedure, rebasing the patches and fixing a
conflict with the last one.

I'll be updating my linux-next upstream soon.
> 
> Thanks
> Guennadi
> ---
> Guennadi Liakhovetski, Ph.D.
> Freelance Open-Source Software Developer
> http://www.open-technology.de/
> 
> [1]
> http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git;a=commitdiff;h=5400a6bf7de5cd4fbd0c55274a79662709d171eb
> 
> [2]
> http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git;a=commitdiff;h=c43c68f839af76f27afc9cbac495dfd5e458649e
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html




Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux