{"thread":{"id":"28152","subject":"Re: linux-next: Tree for Aug 18 (GNU patch and \"git diffs: Support symlinks\")","startedAt":"2011-08-18T09:35:56Z","lastAt":"2011-08-18T09:35:56Z","messageCount":1,"participants":["Sedat Dilek"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"173746","messageId":"CA+icZUXs0cdCna8ogKubpg_SgZo0K3GmHDkBk2gDuJkg7CX0Zw@mail.gmail.com","threadId":"28152","inReplyTo":null,"subject":"Re: linux-next: Tree for Aug 18 (GNU patch and \"git diffs: Support symlinks\")","fromName":"Sedat Dilek","fromEmail":"sedat.dilek@googlemail.com","sentAt":"2011-08-18T09:35:56Z","receivedAt":"2011-08-18T09:35:56Z","isPatch":false,"sender":{"key":"sedat.dilek@googlemail.com","avatar":null},"body":"On Thu, Aug 18, 2011 at 8:00 AM, Stephen Rothwell wrote:\n> Hi all,\n>\n> The powerpc allyesconfig build still fails today.\n>\n> Changes since 20110817:\n>\n> The sound-asoc tree lost its build failure.\n>\n> The tip tree gained a conflict against Linus' tree.\n>\n> The moduleh tree lost 2 of its merge fixups, but I added another.\n>\n> ----------------------------------------------------------------------------\n>\n> I have created today's linux-next tree at\n> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git\n> (patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ).  If you\n> are tracking the linux-next tree using git, you should not use \"git pull\"\n> to do so as that will try to merge the new linux-next release with the\n> old one.  You should use \"git fetch\" as mentioned in the FAQ on the wiki\n> (see below).\n>\n\nJust FYI:\n\nYesterday and today, I had the same problem when applying the\nlinux-next single patch (see attached ErrMsg text file).\n\nI am using a slightly modified kernel-buildsystem from Debian Kernel\nTeam (so not building out of a GIT repository).\n\nThe GNU/patch I have installed from Debian/sid does not include\nsymlink-support for git-diff [1].\nJonathan gave me the pointer to install patch package from Debian/experimental.\nAfter reading its Changelog [2] and Debian-bug #243309 [3] I installed\nthe recommended version.\nIndeed, it fixes the issue.\n\nCristoph, can we have a backport of [1] to patch/sid?\n\nThanks Jonathan!\n\n- Sedat -\n\n[1] http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f9db7450fa2788377c4567b5d0565b0ddfc1015c\n[2] http://packages.debian.org/changelogs/pool/main/p/patch/patch_2.6.1.85-423d-3/changelog\n[3] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=243309\n\n\n[ patch-v3.1-rc2-next-20110818 ]\n...\ndiff --git a/tools/power/cpupower/debug/x86_64/Makefile b/tools/power/cpupower/debug/x86_64/Makefile\nindex dbf1399..3326217 100644\n--- a/tools/power/cpupower/debug/x86_64/Makefile\n+++ b/tools/power/cpupower/debug/x86_64/Makefile\n@@ -1,10 +1,10 @@\n default: all\n\n-centrino-decode: centrino-decode.c\n- $(CC) $(CFLAGS) -o centrino-decode centrino-decode.c\n+centrino-decode: ../i386/centrino-decode.c\n+ $(CC) $(CFLAGS) -o $@ $<\n\n-powernow-k8-decode: powernow-k8-decode.c\n- $(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c\n+powernow-k8-decode: ../i386/powernow-k8-decode.c\n+ $(CC) $(CFLAGS) -o $@ $<\n\n all: centrino-decode powernow-k8-decode\n\ndiff --git a/tools/power/cpupower/debug/x86_64/centrino-decode.c b/tools/power/cpupower/debug/x86_64/centrino-decode.c\ndeleted file mode 120000\nindex 26fb3f1..0000000\n--- a/tools/power/cpupower/debug/x86_64/centrino-decode.c\n+++ /dev/null\n@@ -1 +0,0 @@\n-../i386/centrino-decode.c\n\\ No newline at end of file\ndiff --git a/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c b/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c\ndeleted file mode 120000\nindex eb30c79..0000000\n--- a/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c\n+++ /dev/null\n@@ -1 +0,0 @@\n-../i386/powernow-k8-decode.c\n\\ No newline at end of file\n...\n\n\n$ LC_ALL=C fakeroot make -f debian/rules.gen setup_i386_none_686-small 2>&1 | tee ../setup.log \nmake -f debian/rules.real setup-flavour ABINAME='-next20110818.3' ARCH='i386' COMPILER='gcc-4.6' FEATURESET='none' FLAVOUR='686-small' KCONFIG='debian/config/config debian/config/kernelarch-x86/config debian/config/kernelarch-x86/config-arch-32 debian/config/i386/none/config.686-iniza debian/config/custom-x86/config-debug debian/config/custom-x86/config-fs debian/config/custom-x86/config-infiniband debian/config/custom-x86/config-isa debian/config/custom-x86/config-isdn debian/config/custom-x86/config-multimedia debian/config/custom-x86/config-pseudofs debian/config/custom-x86/config-staging debian/config/i386/none/config.686-small' KERNEL_ARCH='x86' LOCALVERSION='-686-small' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-686-small' MODULES='True' SOURCEVERSION='3.1.0~rc2-1~next20110818.dileks3' TYPE='plain' UPSTREAMVERSION='3.1.0-rc2' VERSION='3.1.0' \nmake[1]: Entering directory `/mnt/sdb3/linux-kernel/linux-3.1-rc2' \nrm -rf 'debian/build/source' \nmkdir -p 'debian/build/source' \ncp -al COPYING CREDITS Documentation Kbuild Kconfig MAINTAINERS Makefile README REPORTING-BUGS arch block crypto drivers firmware fs include init ipc kernel lib mm net samples scripts security sound tools usr virt .gitignore .mailmap 'debian/build/source' \ncd 'debian/build/source'; python '/mnt/sdb3/linux-kernel/linux-3.1-rc2/debian/bin/patch.apply' --overwrite-home='/mnt/sdb3/linux-kernel/linux-3.1-rc2/debian/patches' \nWarning: No version.Debian file, assuming Debian Linux 3.1.0~rc2 \n1 out of 1 hunk FAILED -- saving rejects to file tools/power/cpupower/debug/x86_64/centrino-decode.c.rej \n1 out of 1 hunk FAILED -- saving rejects to file tools/power/cpupower/debug/x86_64/powernow-k8-decode.c.rej\nError: Patch failed\n--> Try to apply base.\n (+) FAIL linux-next/patch-v3.1-rc2-next-20110818\nmake[1]: *** [debian/stamps/source] Error 1\nmake[1]: Leaving directory `/mnt/sdb3/linux-kernel/linux-3.1-rc2'\nmake: *** [setup_i386_none_686-small_real] Error 2\n\n\n-dileks // 18-Aug-2011\n\n"}]}