On Tue, Apr 9, 2013 at 5:13 PM, Stephen Rothwell wrote:
>
> Since you really should have that fix in your -next branch as well (for
> testing), I would merge the same branch that Linus merged i.e. I would
> merge commit 090da752cdd6 ("video:uvesafb: Fix dereference NULL pointer
> code path")
Hi Tomi,
On Tue, 9 Apr 2013 13:10:45 +0300 Tomi Valkeinen wrote:
>
> I wonder what I should do about this conflict. Both the fix in Linus'
> tree and the new code come from fbdev tree (I'm currently handling fbdev
> patches), and it feels a bit silly to have conflicts between the fixes
> and new
Hi,
On 2013-04-08 07:36, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/fbmon.c between commit 477fc03f5baa ("fbmon: use
> VESA_DMT_VSYNC_HIGH to fix typo") from Linus' tree and commit
> 06a3307975aa ("videomode: combine
Hi,
On 2013-04-08 07:36, Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/fbmon.c between commit 477fc03f5baa (fbmon: use
VESA_DMT_VSYNC_HIGH to fix typo) from Linus' tree and commit
06a3307975aa (videomode: combine videomode
Hi Tomi,
On Tue, 9 Apr 2013 13:10:45 +0300 Tomi Valkeinen tomi.valkei...@ti.com wrote:
I wonder what I should do about this conflict. Both the fix in Linus'
tree and the new code come from fbdev tree (I'm currently handling fbdev
patches), and it feels a bit silly to have conflicts between
On Tue, Apr 9, 2013 at 5:13 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
Since you really should have that fix in your -next branch as well (for
testing), I would merge the same branch that Linus merged i.e. I would
merge commit 090da752cdd6 (video:uvesafb: Fix dereference NULL pointer
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/fbmon.c between commit 477fc03f5baa ("fbmon: use
VESA_DMT_VSYNC_HIGH to fix typo") from Linus' tree and commit
06a3307975aa ("videomode: combine videomode dmt_flags and data_flags")
from the omap_dss2 tree.
I
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/fbmon.c between commit 477fc03f5baa (fbmon: use
VESA_DMT_VSYNC_HIGH to fix typo) from Linus' tree and commit
06a3307975aa (videomode: combine videomode dmt_flags and data_flags)
from the omap_dss2 tree.
I
Hi,
On 2012-11-26 07:22, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> drivers/video/omap2/dss/dss.c between commit f65e384bec59 ("omapdss: dss:
> Fix clocks on OMAP363x") from Linus' tree and commit bd81ed081887
> ("OMAPDSS: DSS: use
Hi,
On 2012-11-26 07:22, Stephen Rothwell wrote:
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/omap2/dss/dss.c between commit f65e384bec59 (omapdss: dss:
Fix clocks on OMAP363x) from Linus' tree and commit bd81ed081887
(OMAPDSS: DSS: use
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/omap2/dss/dss.c between commit f65e384bec59 ("omapdss: dss:
Fix clocks on OMAP363x") from Linus' tree and commit bd81ed081887
("OMAPDSS: DSS: use omapdss_version") from the omap_dss2 tree.
I fixed it up
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/omap2/dss/dss.c between commit f65e384bec59 (omapdss: dss:
Fix clocks on OMAP363x) from Linus' tree and commit bd81ed081887
(OMAPDSS: DSS: use omapdss_version) from the omap_dss2 tree.
I fixed it up (using
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/omap2/dss/sdi.c between commit 35d678664873 ("OMAPDSS: Fix SDI
PLL locking") from Linus' tree and commit 889b4fd7eed2 ("OMAPDSS: SDI: Maintain
copy of data pairs in driver data") from the omap_dss2 tree.
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
drivers/video/omap2/dss/sdi.c between commit 35d678664873 (OMAPDSS: Fix SDI
PLL locking) from Linus' tree and commit 889b4fd7eed2 (OMAPDSS: SDI: Maintain
copy of data pairs in driver data) from the omap_dss2 tree.
Just
14 matches
Mail list logo