From a1623d57b5581116d3a092fe8e26dcd326ef24fa Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Jun 2009 14:28:35 -0700 Subject: [PATCH] kclient: include fs/staging patch in series --- src/kernel/import_patch_set_into_linux_git.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh index de43e956b4e..52fff4acea9 100755 --- a/src/kernel/import_patch_set_into_linux_git.sh +++ b/src/kernel/import_patch_set_into_linux_git.sh @@ -22,6 +22,9 @@ cp $cephtree/src/kernel/ceph.txt Documentation/filesystems git branch -D series_start git branch series_start +# fs/staging +git cherry-pick 1679fd1babdf67274080e4cdd20c2a6bb5bfbbcf + git add Documentation/filesystems/ceph.txt git commit -F - <