> -----Original Message----- > From: ewg-boun...@lists.openfabrics.org [mailto:ewg- > boun...@lists.openfabrics.org] On Behalf Of Steve Wise > Sent: Monday, December 01, 2014 9:56 PM > To: 'Vladimir Sokolovsky' > Cc: 'OpenFabrics EWG' > Subject: Re: [ewg] [GIT PULL compat-rdma] more cxgb4 fixes > > Hey Vlad, I don't understand why you changed the names of the patch files, > and how I should avoid you having to do this with my patches in the future. > > Can you please help me understand? :) > > Thanks, > > Steve. >
Hi Steve, Actually, I did not changed the names of patches. It was done automatically by git. Here is the procedure I use to refresh the patches in order to update the base kernel: Use linux git (git://git.openfabrics.org/compat-rdma/linux-3.18.git master) # cd linux-3.18 Apply all patches from "compat-rdma/patches": # git am --reject ../compat-rdma/patches/*.patch - This command failed on cxgb patches as they did not include required fields like "From:", "Subject:" ... So, I added missing fields. After fixing patches format and conflicts occurred due to the kernel base update run: # git format-patch -o new_patches --subject-prefix="PATCH" --no-numbered <last commit before backports> Then replace all patches under "compat-rdma/patches" by the patches from the new_patches directory. Regards, Vladimir > > -----Original Message----- > > From: Steve Wise [mailto:sw...@opengridcomputing.com] > > Sent: Tuesday, November 25, 2014 10:16 AM > > To: Vladimir Sokolovsky > > Cc: 'OpenFabrics EWG' > > Subject: Re: [GIT PULL compat-rdma] more cxgb4 fixes > > > > On 11/24/2014 10:00 AM, Vladimir Sokolovsky wrote: > > > > > > Hi Steve, > > > First, I rebased backports with linux-3.18-rc6. > > > Second, I use "git am" to refresh backports for the new kernel RC. > > > So, please create your patches in format that can be applied by "git am". > > > And it does not matter if you add a patch per kernel or one patch > > > for many kernels. > > > > > > > Can you please describe the process you followed to refresh the kernel > > RC? That will help me better understand things. > > > > Thanks, > > > > Steve. > > _______________________________________________ > ewg mailing list > ewg@lists.openfabrics.org > http://lists.openfabrics.org/mailman/listinfo/ewg _______________________________________________ ewg mailing list ewg@lists.openfabrics.org http://lists.openfabrics.org/mailman/listinfo/ewg