On Thu, Aug 10, 2017 at 08:18:54PM +0000, Kershner, David A wrote: > > -----Original Message----- > > From: David Kershner [mailto:david.kershner@xxxxxxxxxx] > > Sent: Tuesday, August 1, 2017 10:40 AM > > To: gregkh@xxxxxxxxxxxxxxxxxxx; driverdev-devel@xxxxxxxxxxxxxxxxxxxxxx; > > *S-Par-Maintainer <SParMaintainer@xxxxxxxxxx>; jes.sorensen@xxxxxxxxx > > Cc: Kershner, David A <David.Kershner@xxxxxxxxxx> > > Subject: [PATCH 00/45] staging: unisys: more changes to the code. > > > > The following patch series addresses issues from internal code-review as > > well as checkpatch errors and suggestions from GregKH. > > > > We have updated our commenting style to be more readable (and adopted a > > kernel-doc like format). We have intentionally not made them kernel-doc by > > removing the extra asterisk from the first line. > > > > Greg, I just realized that although the patchset applies cleanly to > staging-next, it will conflict with the patch: > > Subject: [PATCH v2] staging: unisys: Switch to use new generic UUID > API > From: Andy Shevchenko [mailto:andriy.shevchenko@xxxxxxxxxxxxxxx] > > So feel free to drop the series and accept his and I can fix the conflicts, > or > do you want to drop all the patches and I pick it up and resend the series > with the patch included? I'll drop all of the patches, and wait for you to resend them all with his patch as part of the series. That's the easiest for me :) thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel