On Fri, Sep 16, 2011 at 08:12:35PM -0400, Kevin McKinney wrote: > Hi Greg, > On Fri, Sep 16, 2011 at 6:41 PM, Greg KH <greg@xxxxxxxxx> wrote: > > On Fri, Sep 16, 2011 at 04:04:22PM -0400, Kevin McKinney wrote: > >> Hi Greg, > >> > >> On Fri, Sep 16, 2011 at 2:14 PM, Greg KH <greg@xxxxxxxxx> wrote: > >> > On Mon, Sep 12, 2011 at 08:59:18PM -0400, Kevin McKinney wrote: > >> >> In the first alteration, the MAX_CNTL_PKT_SIZE is the > >> >> maximum size of the control packet in ->Adapter->txctlpacket[] > >> >> which is defined in InitAdapter(). This caps the size of > >> >> kmalloc memory allocation. In the second change, this max > >> >> cap fixes a potential memory corruption bug when subsequent > >> >> memset and memcpy calls are invoked. > >> >> > >> >> Signed-off-by: Kevin McKinney <klmckinney1@xxxxxxxxx> > >> >> --- > >> >> drivers/staging/bcm/Bcmchar.c | 3 +++ > >> >> drivers/staging/bcm/Misc.c | 4 ++++ > >> >> 2 files changed, 7 insertions(+), 0 deletions(-) > >> >> delete mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio.h > >> >> > >> >> diff --git a/arch/arm/mach-lpc32xx/include/mach/gpio.h b/arch/arm/mach-lpc32xx/include/mach/gpio.h > >> >> deleted file mode 100644 > >> >> index e69de29..0000000 > >> > > >> > Your diffstat above doesn't match this line, so I really can't trust > >> > this patch at all. > >> > > >> > And it doesn't make sense, care to redo these 2 so they do make sense? > >> > > >> Yes, I will redo these two patches; but are you saying that my above > >> patch description does not make sense ? > > > > No, your patch is removing a whole file, yet it doesn't show up in the > > diffstat, so something is seriously wrong. > > > > Actually, I don't even know how you can generate such a thing, unless > > you were editing the patch by hand. Is that how this happened? > > > > No, I did not manually edit the patch. After I made my changes, I ran > the following command, "format-patch master..kemnet" and this > generated my patches. I am not sure what happened, but maybe I need to > keep my local branch up to date ? If I execute the below commands, I > think this will do it ? Or am I missing another step? > > git branch kemnet > git remote update > git reset --hard origin/master That should work, but note that you deleted the above gpio.h file for some odd reason, please try to figure out how that happened and try not to do it again :) greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
