diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-04-14 10:09:30 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2014-04-14 10:09:30 -0600 |
| commit | e0097d060a677f2f675d94365d262f10d9b60c3b (patch) | |
| tree | 951acafaef8a63ab98a078e076b556e09c7c4096 | |
| parent | 816308608cfe295e92f45e19a6bb0452be0e6715 (diff) | |
| download | maint-scripts-e0097d060a677f2f675d94365d262f10d9b60c3b.tar.gz | |
Update to start v3.16 afresh
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rwxr-xr-x | merge-linux-tegra.sh | 2 | ||||
| -rw-r--r-- | tegra-branches.sh.dot | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/merge-linux-tegra.sh b/merge-linux-tegra.sh index 227c2cc..3654d37 100755 --- a/merge-linux-tegra.sh +++ b/merge-linux-tegra.sh @@ -7,7 +7,7 @@ set -x if [ "$1" != "--no-reset" ]; then git checkout for-next - git reset --hard v3.14-rc1 + git reset --hard ${merge_base} fi for b in ${branches}; do diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot index ad3d61a..5bb3f5e 100644 --- a/tegra-branches.sh.dot +++ b/tegra-branches.sh.dot @@ -1,4 +1,4 @@ +merge_base=v3.15-rc1 + branches="" -branches="${branches} for-3.15/drivers" # On v3.14-rc1 -branches="${branches} for-3.15/dt" # On v3.14-rc1 -branches="${branches} for-3.15/defconfig" # On v3.14-rc1 +#branches="${branches} for-3.16/dt" # On v3.15-rc1 |