android-linux-stable / script Goto Github PK
View Code? Open in Web Editor NEWA script to help with merging linux-stable into your own repository
A script to help with merging linux-stable into your own repository
git merge --continue doesn't work!
I merged up to v3.18.140 from 3.18.122 but I can't seem to get past that version with this script. When I try to go to v3.19 or v4 it complains that they are already in 3.18.140.
Commands and output:
$ ../linux-stable.sh -m -k "`pwd`" -v 3.19.1
=============================
== Updating linux-stable ==
=============================
From https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
* branch HEAD -> FETCH_HEAD
linux-stable updated successfully!
============================
== Calculating versions ==
============================
Current kernel version: 3.18.140
Latest kernel version: 3.18.140
3.19.1 is already present in 3.18.140!
$ ../linux-stable.sh -m -k "`pwd`" -v 3.19
=============================
== Updating linux-stable ==
=============================
From https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
* branch HEAD -> FETCH_HEAD
linux-stable updated successfully!
============================
== Calculating versions ==
============================
Current kernel version: 3.18.140
Latest kernel version: 3.18.140
3.19 is already present in 3.18.140!
$ ../linux-stable.sh -m -k "`pwd`" -v 4
=============================
== Updating linux-stable ==
=============================
From https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
* branch HEAD -> FETCH_HEAD
linux-stable updated successfully!
============================
== Calculating versions ==
============================
Current kernel version: 3.18.140
Latest kernel version: 3.18.140
4 is already present in 3.18.140!
What is up with this?
i want to revert my kernel from 3.18.x (linux-3.18.y) to 3.13 or linux-stable-lts is it possible ?
Hi nathanachance,Nice script! Really thanks for this,Im trying to upstream my kernel, when I run : "./linux-stable.sh -m" I get and error : "error: unknown option `sort=-taggerdate' , And the "Latest kernel version:" its empty, I have the file in the root of my kernel folder
I love using this script when i need to but the biggest downfall is the manual intervention for cherry-picking empty commits. I looked into it a bit and it seems theres a fairly simple solution that takes advantage of git rev-list. Something like this:
git rev-list --reverse v3.18.139..v3.18.140 . | git cherry-pick --stdin
I have tested it in place of your cherry-pick case statement and it seems to work without a hitch. If you decide to implement it would just make the workflow that much smoother.
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.