reiserfs-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* patching problem with patch-3.13.5-6 and reiser4-for-3.13.1.patch on 3.13x
@ 2014-03-12 10:53 doiggl
  0 siblings, 0 replies; only message in thread
From: doiggl @ 2014-03-12 10:53 UTC (permalink / raw)
  To: reiserfs-devel

Hello,
Why does reiser4-for-3.13.1.patch fail to apply when patch patch-3.13.5-6
is applied as well.



The failed log shows:

[   82s] + cd linux-3.13
[   82s] + /home/abuild/rpmbuild/SOURCES/apply-patches --vanilla
/home/abuild/rpmbuild/SOURCES/series.conf ..
[   82s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.1
[   82s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.1-2
[   82s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.2-3
[   82s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.3-4
[   82s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.4-5
[   82s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.5-6
[   82s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.rpmify/reiser4-for-3.13.1.patch
[   83s] 1 out of 8 hunks FAILED -- saving rejects to file
fs/fs-writeback.c.rej
[   83s] ++ echo '*** patch ../patches.rpmify/reiser4-for-3.13.1.patch
failed ***'
[   83s] *** patch ../patches.rpmify/reiser4-for-3.13.1.patch failed ***


So I commented out the line:
patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.5-6


The passed log now  shows:

[   76s] + cd linux-3.13
[   76s] + /home/abuild/rpmbuild/SOURCES/apply-patches --vanilla
/home/abuild/rpmbuild/SOURCES/series.conf ..
[   76s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.1
[   76s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.1-2
[   76s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.2-3
[   76s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.3-4
[   77s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.kernel.org/patch-3.13.4-5
[   77s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.rpmify/reiser4-for-3.13.1.patch
[   77s] + patch -s -F0 -E -p1 --no-backup-if-mismatch -i
../patches.rpmify/nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo



The entire log is at: {it is still being compiled}

https://build.opensuse.org/package/live_build_log/home:doiggl/kernel-reiser4/openSUSE_13.1/x86_64

project:
https://build.opensuse.org/package/show/home:doiggl/kernel-reiser4

Here is a link to file which contains patch patch-3.13.5-6
https://build.opensuse.org/source/home:doiggl/kernel-reiser4/patches.kernel.org.tar.bz2?rev=38b66b574f22e579e7a43371a74eac05

Link on how to apply patches:
https://build.opensuse.org/source/home:doiggl/kernel-reiser4/series.conf?rev=38b66b574f22e579e7a43371a74eac05

I wonder what lines in patch causes the fail, and is there a fix for
this,or just leave/comment out the patch.  patch-3.13.5-6 ?
Thanks Glenn

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-03-12 10:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-12 10:53 patching problem with patch-3.13.5-6 and reiser4-for-3.13.1.patch on 3.13x doiggl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).