hmm... there are different versions of the patch and different git
repositories around. This one:
works for the github branch you mentioned:
patch -p1 < ~/Downloads/2661328b.diff
patching file lustre/llite/dir.c
Hunk #1 succeeded at 1051 with fuzz 1 (offset -126 lines).
Hunk #2 succeeded at 1197 (offset -112 lines).
Hunk #3 succeeded at 1264 (offset -117 lines).
sorry, this was against an outdated
git-checkout - against the head of
b1_8 the 2661328b patch even applies without offset
On 03/24/2015 04:18 PM, Marcin Dulak wrote:
> the patch fails to apply against the "git clone -b b1_8
> As Michael noticed
> github's b1_8 branch is different from
> I chose to use the githubs b1_8 branch because it provides the
> autogen.sh script (the src.rpm lacks that).
> I'm applying the patch with:
> rhel6_lustre18.vm.provision :shell, :inline => "wget
> rhel6_lustre18.vm.provision :shell, :inline => "unzip
> rhel6_lustre18.vm.provision :shell, :inline => "cd lustre-1.8.9; patch
> -p1 < ../dcfd53de.diff"
> and the rej file is attached.
> I have verified that the patch fails to apply to
> Best regards,
> On 03/24/2015 01:52 PM, Martin Hecht wrote:
>> Hi Marcin,
>> On 03/24/2015 11:40 AM, Marcin Dulak wrote:
>>> root/rpmbuild/BUILD/lustre-1.8.9/lustre/llite/dir.c: In function
>>> /root/rpmbuild/BUILD/lustre-1.8.9/lustre/llite/dir.c:1288: error:
>>> assignment from incompatible pointer type
>>> /root/rpmbuild/BUILD/lustre-1.8.9/lustre/llite/dir.c:1360: error:
>>> passing argument 1 of 'putname' from incompatible pointer type
>> this looks like LU-2800 - you can get the appropriate patch from
>> best regards,