On Donnerstag, 24. April 2008, Tejun Heo wrote: > Volker Armin Hemmann wrote: > > On Donnerstag, 24. April 2008, Tejun Heo wrote: > >> Ah.. right. The patch is for libata-dev#upstream branch which contains > >> ahci_enable_ahci() refactoring change. You'll need to get the latest > >> linux-2.6 git tree which contains it. > > > > which isn't -git4 > > > > *sigh* > > > > then I did: > > git clone > > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > > Initialized empty Git repository in /usr/src/linux-2.6/.git/ > > remote: Counting objects: 761806, done. > > remote: Compressing objects: 100% (130538/130538), done. > > remote: Total 761806 (delta 633235), reused 758782 (delta 630257) > > Receiving objects: 100% (761806/761806), 179.18 MiB | 10975 KiB/s, done. > > Resolving deltas: 100% (633235/633235), done. > > Checking out files: 100% (23886/23886), done. > > > > cd linux-2.6 > > patch -p1 < ../ahci.patch > > patching file drivers/ata/ahci.c > > Hunk #1 FAILED at 556. > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/ata/ahci.c.rej > > If you can git, just do the following... > > $ git fetch > git://git.kernel.org//pub/scm/linux/kernel/git/jgarzik/libata-dev.git > upstream:upstream $ git checkout -f upstream > $ patch -p1 < ahci.patch > > Thanks. that did not work: git fetch git://git.kernel.org//pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream:upstream fatal: Not a git repository git fetch git://git.kernel.org//pub/scm/linux/kernel/git/jgarzik/libata-dev.git fatal: Not a git repository git fetch git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream:upstream fatal: Not a git repository energy src # git fetch git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git fatal: Not a git repository energy src # git clone git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git Initialized empty Git repository in /usr/src/libata-dev/.git/ remote: Counting objects: 743097, done. remote: Compressing objects: 100% (127420/127420), done. remote: Total 743097 (delta 617111), reused 740658 (delta 614672) Receiving objects: 100% (743097/743097), 173.30 MiB | 11013 KiB/s, done. Resolving deltas: 100% (617111/617111), done. Checking out files: 100% (23824/23824), done. git fetch git://git.kernel.org//pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream:upstream fatal: Not a git repository energy src # cd libata-dev energy libata-dev # git checkout -f upstream git checkout: updating paths is incompatible with switching branches/forcing Did you intend to checkout 'upstream' which can not be resolved as commit? energy libata-dev # git checkout -f git://git.kernel.org//pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream:upstream git checkout: updating paths is incompatible with switching branches/forcing energy libata-dev # ls arch COPYING crypto drivers include ipc kernel MAINTAINERS mm README samples security usr block CREDITS Documentation fs init Kbuild lib Makefile net REPORTING-BUGS scripts sound virt energy libata-dev # patch -p1 < ../ahci.patch patching file drivers/ata/ahci.c Hunk #1 FAILED at 556. 1 out of 1 hunk FAILED -- saving rejects to file drivers/ata/ahci.c.rej Glück Auf, Volker -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
