On Fri, 2012-07-20 at 11:00 -0700, Nicholas A. Bellinger wrote: > On Fri, 2012-07-20 at 15:03 +0300, Michael S. Tsirkin wrote: > > On Wed, Jul 18, 2012 at 02:20:58PM -0700, Nicholas A. Bellinger wrote: > > > On Wed, 2012-07-18 at 19:09 +0300, Michael S. Tsirkin wrote: > > > > On Wed, Jul 18, 2012 at 12:59:32AM +0000, Nicholas A. Bellinger wrote: > > > > > > <SNIP> > > > > > > > > > > > > > Changelog v2 -> v3: > > > > > > > > > > Unlock on error in tcm_vhost_drop_nexus() (DanC) > > > > > Fix strlen() doesn't count the terminator (DanC) > > > > > Call kfree() on an error path (DanC) > > > > > Convert tcm_vhost_write_pending to use target_execute_cmd (hch + nab) > > > > > Fix another strlen() off by one in tcm_vhost_make_tport (DanC) > > > > > Add option under drivers/staging/Kconfig, and move to drivers/vhost/tcm/ > > > > > as requested by MST (nab) > > > > > > > > > > --- > > > > > drivers/staging/Kconfig | 2 + > > > > > drivers/vhost/Makefile | 2 + > > > > > drivers/vhost/tcm/Kconfig | 6 + > > > > > drivers/vhost/tcm/Makefile | 1 + > > > > > drivers/vhost/tcm/tcm_vhost.c | 1611 +++++++++++++++++++++++++++++++++++++++++ > > > > > drivers/vhost/tcm/tcm_vhost.h | 74 ++ > > > > > 6 files changed, 1696 insertions(+), 0 deletions(-) > > > > > create mode 100644 drivers/vhost/tcm/Kconfig > > > > > create mode 100644 drivers/vhost/tcm/Makefile > > > > > create mode 100644 drivers/vhost/tcm/tcm_vhost.c > > > > > create mode 100644 drivers/vhost/tcm/tcm_vhost.h > > > > > > > > > > > > > Really sorry about making you run around like that, > > > > I did not mean moving all of tcm to a directory, > > > > just adding tcm/Kconfig or adding drivers/vhost/Kconfig.tcm > > > > because eventually it's easier to keep it all together > > > > in one place. > > > > > > > > > > Er, apologies for the slight mis-understanding here.. Moving back now + > > > fixing up the Kbuild bits. > > > > I'm going offline in several hours and am on vacation for a week > > starting tomorrow. So to make 3.6, and if you intend to merge through my > > tree, the best bet is if you can send the final version real soon now. > > > > Ok, thanks for the heads up here.. > > So aside from Greg-KH's feedback to avoid the drivers/staging/ Kconfig > include usage, and one more bugfix from DanC from this morning those are > the only pending changes for RFC-v4. > > If it's OK I'd prefer to take these via target-pending with the > necessary Acked-By's, especially if you'll be AFK next week.. > > Would you like to see a RFC-v4 with these changes included..? > > Thank you, > Actually sorry, the patch from DanC is for target core, and not tcm_vhost specific change.. So really the only thing left to resolve for an initial merge is Greg-KH's comments wrt to drivers/staging Kconfig usage.. Are you OK with just adding CONFIG_STAGING following Greg-KH's feedback..? -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html