From 7e51c528055d1d12a96b03587e2b45712f72daa1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 19 Jun 2009 15:03:11 -0700 Subject: [PATCH] kclient: update script importer --- src/kernel/import_patch_set_into_linux_git.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh index 52fff4acea9fe..6e5fe28246e78 100755 --- a/src/kernel/import_patch_set_into_linux_git.sh +++ b/src/kernel/import_patch_set_into_linux_git.sh @@ -10,7 +10,7 @@ test -e include/linux/mm.h || exit 0 test -e $cephtree/src/kernel/super.h || exit 0 # copy into the tree -mkdir $target/ceph +mkdir -p $target/ceph mkdir $target/ceph/crush cp $cephtree/src/kernel/Makefile $target/ceph cp $cephtree/src/kernel/Kconfig $target/ceph @@ -23,7 +23,7 @@ git branch -D series_start git branch series_start # fs/staging -git cherry-pick 1679fd1babdf67274080e4cdd20c2a6bb5bfbbcf +git cherry-pick 5556036065d8b04b2f7dd439fbf0d710e295cd44 git add Documentation/filesystems/ceph.txt git commit -F - <