On 08/15, Greg KH wrote: > On Thu, Aug 14, 2014 at 05:53:10PM -0700, Aaron Brice wrote: > > Bring braces in line with CodingStyle > > > > Signed-off-by: Aaron Brice <aaron@xxxxxxxxxxxxxxx> > > --- > > Applies to next-20140814 > > > > drivers/staging/dgnc/dgnc_neo.c | 10 ++++------ > > drivers/staging/dgnc/dgnc_sysfs.c | 6 ++---- > > drivers/staging/dgnc/dgnc_tty.c | 38 +++++++++++--------------------------- > > 3 files changed, 17 insertions(+), 37 deletions(-) > > This conflicts with some patches that others have sent before you, so it > will not end up applying to my tree properly :( Greg refers to my patches. For you to know I fixed the braces in the dgnc_neo.c and did some other changes in the dgnc_tty.c file. The dgnc_sysfs.c is not touched by me so far. cheers, konrad > Can you wait until after 3.17-rc1 is out and I can push out the updated > staging tree patches and resync after that? Should happen by next > Tuesday or so. > > thanks, > > greg k-h > _______________________________________________ > devel mailing list > devel@xxxxxxxxxxxxxxxxxxxxxx > http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
