From: Sage Weil Date: Wed, 25 Feb 2009 23:07:38 +0000 (-0800) Subject: kclient: fix kbuild patch, import script X-Git-Tag: v0.7~141 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=180a3d919be9e59064d3fa7c7997a8b3cec341cd;p=ceph.git kclient: fix kbuild patch, import script --- diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh index 0ec40ceb7cdf..a468b89633be 100755 --- a/src/kernel/import_patch_set_into_linux_git.sh +++ b/src/kernel/import_patch_set_into_linux_git.sh @@ -11,10 +11,10 @@ test -e $cephtree/src/kernel/super.h || exit 0 mkdir fs/ceph mkdir fs/ceph/crush cp $cephtree/src/kernel/Makefile fs/ceph +cp $cephtree/src/kernel/Kconfig fs/ceph cp $cephtree/src/kernel/*.[ch] fs/ceph cp $cephtree/src/kernel/crush/*.[ch] fs/ceph/crush cp $cephtree/src/kernel/ceph.txt Documentation/filesystems -git apply $cephtree/src/kernel/kbuild.patch # build the patch sequence git branch -D series_start @@ -255,6 +255,7 @@ can also be enabled via .config. EOF +git apply $cephtree/src/kernel/kbuild.patch git add fs/ceph/Makefile git add fs/ceph/Kconfig git commit -F - <