Re: [PATCH] staging:lustre:libcfs: Merge linux-proc.c into module.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



A: No.
Q: Should I include quotations after my reply?

http://daringfireball.net/2007/07/on_top


On Mon, Mar 02, 2015 at 11:18:09AM +0800, Matt Tyler wrote:
> hey greg, I've updated to the latest linux-next, applied the patch and
> compiled with no issues.

Please work against my staging-testing branch of staging.git, as it
contains over a hundred additional patches that I've applied in the past
day.


> I think it might be due to clashes with another patch that has been
> proposed by Tal Shorer to fix style violations in linux-proc.c (which
> my patch merges into module.c)
> 
> Tal - do you want to take my patch, apply it onto your tree, and then
> apply the style fixes? It shouldn't be too difficult to merge our
> patches into one series?

If I've already accepted a conflicting patch, there's nothing to
"merge", you just have to update your patch.

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel




[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux