On Wed, Jul 04, 2012 at 12:57:58, Tony Lindgren wrote: > Hi > > Applying these, but few comments below to make my life easier.. > > * Vaibhav Hiremath <hvaibhav@xxxxxx> [120628 08:04]: > > All OMAP2PLUS based devices, builds omap-device.o target; > > so just add one entry so that there is no need to patch this file > > for any future OMAP2+ devices. > > > > Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> > > Cc: Tony Lindgren <tony@xxxxxxxxxxx> > > Cc: Kevin Hilman <khilman@xxxxxx> > > Cc: Paul Walmsley <paul@xxxxxxxxx> > > > > NOTE: No code change from last version. > > Extra comments like this should be within the --- sections so they > down't show up when applying the patch. Otherwise I have to manually > edit every patch, which sucks. > Oops...my bad. These comments I keep deliberately after signoff so that I can move it after --- section while submitting, but somehow missed to do it for this patch-series. I will take care of it in the future, sorry for inconvenience. > Then, I'm leaving out the CLEANUP part in $Subject, that alone is not > a reason to patch anything. The description should say why the patch > is needed, which it does. If you want to specify that this should be > grouped in the clean-up branch, then that too could be mentioned within > the --- sections. > Point taken, and will follow now. > > --- > > arch/arm/plat-omap/Makefile | 4 +--- > > 1 files changed, 1 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile > > index 6d87532..961bf85 100644 > > --- a/arch/arm/plat-omap/Makefile > > +++ b/arch/arm/plat-omap/Makefile > > @@ -10,9 +10,7 @@ obj-n := > > obj- := > > > > # omap_device support (OMAP2+ only at the moment) > > -obj-$(CONFIG_ARCH_OMAP2) += omap_device.o > > -obj-$(CONFIG_ARCH_OMAP3) += omap_device.o > > -obj-$(CONFIG_ARCH_OMAP4) += omap_device.o > > +obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o > > > > obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o > > obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o > > -- > > 1.7.0.4 > > > > This patch did not apply for some reason, I got: > > patching file arch/arm/plat-omap/Makefile > patch: **** malformed patch at line 73: 1.7.0.4 > > So please tune up your scripts a bit to the patches can be applied > as they are without manual editing ;) > Hmmmm... I usually submit the patch against linux-omap/master (to handle cross dependencies), which in some cases fails on other branches you maintain. Probably I will make sure that it allies atleast to relevant branches, for example, in this case it should be applied on linux-omap/cleanup branch as well. Thanks, Vaibhav -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html