linux-next: manual merge of the tip tree with the tree

From: Mark Brown
Date: Tue Mar 11 2014 - 15:04:40 EST

Next message: Linus Torvalds: "Re: [PATCH] fs: fix i_writecount on shmem and friends"
Previous message: Jason Gunthorpe: "Re: [RFC PATCH v2 04/14] mtd: nand: define struct nand_timings"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi all,

Today's linux-next merge of the tip tree got a conflict in drivers/video/fbdev/sgivwfb.c between commit 844901baede6b5 ("video: move fbdev to drivers/video/fbdev") from the omap2_dss tree and commit c5f9ee3d665a76 ("x86, platforms: Remove SGI Visual Workstation") from the tip tree.

I fixed it up by deleting the offending driver and can carry the fix as necessary (no action is required).

Attachment: pgpYFQzHLrtMz.pgp
Description: PGP signature

Next message: Linus Torvalds: "Re: [PATCH] fs: fix i_writecount on shmem and friends"
Previous message: Jason Gunthorpe: "Re: [RFC PATCH v2 04/14] mtd: nand: define struct nand_timings"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]