On Fri, Mar 31, 2017 at 02:36:31PM +0100, Dan MacDonald wrote: > Hi all > > Up until now I've only ever used the most basic features of git, so > I've had to do some research into how to best/cleanly extract > Phillipps patches so that I can include his changes into an Arch > kernel PKGBUILD. > > I think the following should work: > > git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > cd linux > git fetch https://git.pengutronix.de/git/pza/linux.git > tags/v4.10-ipu-dp-plane-fix > git checkout FETCH_HEAD > git whatchanged -p origin/master..FETCH_HEAD > sabre-lite.patch I don't think that will work, because it'll output the changes as individual patches in reverse order (newest first) which will be no good when trying to feed it into patch or git apply. I think what you instead want is: git diff origin/master...FETCH_HEAD > sabre-lite.patch which will be the changes that are in FETCH_HEAD that aren't in origin/master as a single patch. > I should then be able to include that patch in a 4.11-rc4 PKGBUILD - > I'll give it a go this weekend and see if it applies and builds OK but > please let me know if anyone sees any flaws in this procedure. Thanks - one of the issues is that not everyone knows the details of distribution package build systems (each distro seems to have their own unique way of building and packaging stuff.) -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
