On Sun, May 10, 2015 at 03:09:03PM +0200, Greg KH wrote: > On Mon, May 04, 2015 at 05:15:51PM -0700, Luis R. Rodriguez wrote: > > --- > > drivers/staging/sm750fb/sm750.c | 36 ++++-------------------------------- > > drivers/staging/sm750fb/sm750.h | 3 --- > > drivers/staging/sm750fb/sm750_hw.c | 3 +-- > > 3 files changed, 5 insertions(+), 37 deletions(-) > > Still doesn't apply to my tree: I did base it on that day's staging tree, staging is just a fast moving tree. In the future use of SmPL, when provided, to address merge conflicts might help us on git. Meanwhile I've addressed the conflict and will send v5 based on today's tree outlook. Luis _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
