Merge pull request #2689 from akanksha216/add_upstream_ftrace

 add_upstream_ftrace

kernel/kselftest.py

@@ -100,6 +100,7 @@ def setUp(self):
         if self.run_type == 'upstream':
             location = self.params.get('location', default='https://github.c'
                                        'om/torvalds/linux/archive/master.zip')
+            git_branch = self.params.get('branch', default='master')
             path = ''
             match = next(
                 (ext for ext in [".zip", ".tar"] if ext in location), None)
@@ -109,7 +110,7 @@ def setUp(self):
                 archive.extract(tarball, self.workdir)
                 path = glob.glob(os.path.join(self.workdir, "linux*"))
             else:
-                git.get_repo(location, destination_dir=self.workdir)
+                git.get_repo(location, branch=git_branch, destination_dir=self.workdir)
                 path = glob.glob(self.workdir)
             for l_dir in path:
                 if os.path.isdir(l_dir) and 'Makefile' in os.listdir(l_dir):

kernel/kselftest.py.data/ftrace_powerpc.yaml

@@ -0,0 +1,9 @@
+component: !mux
+    ftrace:
+        comp: 'ftrace'
+
+run_type: !mux
+    upstream:
+        type: 'upstream'
+        location: 'git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git'
+        branch: 'merge'

kernel/kselftest.py.data/trace_tests.yaml

@@ -14,3 +14,6 @@ component: !mux
 run_type: !mux
     distro:
         type: 'distro'
+    upstream:
+        type: 'upstream'
+        location: 'https://github.com/torvalds/linux/archive/master.zip'