On Wed, Jun 8, 2016 at 8:56 PM, Eric Sandeen <sandeen@xxxxxxxxxxx> wrote: > On 6/8/16 9:53 PM, Reinoud Koornstra wrote: > >>> In your Linus git tree: >>> >>> $ git remote add xfsdev git://git.kernel.org/git/dgc/linux-xfs.git >>> $ git remote update >>> $ git checkout -b xfsdev-merge v4.6 >>> $ git merge xfsdev/xfs-for-linus-4.7-rc1 >> >> Tried to do this: >> >> reinoud@router-dev:~/Downloads/kernel_current$ git remote add xfsdev >> git://git.kernel.org/git/dgc/linux-xfs.git > > I think that should be: > > git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git Ok That worked better indeed. :) reinoud@router-dev:~/Downloads/kernel_current$ git remote add xfsdev git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git reinoud@router-dev:~/Downloads/kernel_current$ git remote update Fetching origin Fetching xfsdev remote: Counting objects: 139, done. [SNIP] reinoud@router-dev:~/Downloads/kernel_current$ git checkout -b xfsdev-merge v4.6 Checking out files: 100% (9437/9437), done. Switched to a new branch 'xfsdev-merge' reinoud@router-dev:~/Downloads/kernel_current$ git merge xfsdev/xfs-for-linus-4.7-rc1 merge: xfsdev/xfs-for-linus-4.7-rc1 - not something we can merge So i tried this: reinoud@router-dev:~/Downloads/kernel_current$ git merge xfs-for-linus-4.7-rc1 Auto-merging fs/xfs/xfs_super.c Auto-merging fs/xfs/xfs_pnfs.c Auto-merging fs/xfs/xfs_mount.h Auto-merging fs/xfs/xfs_mount.c Auto-merging fs/xfs/xfs_file.c Auto-merging fs/xfs/xfs_bmap_util.c Auto-merging fs/xfs/xfs_aops.c Auto-merging fs/xfs/libxfs/xfs_bmap.c Auto-merging fs/namei.c Merge made by the 'recursive' strategy. The terminal did hang .... in 4.6 I killed the git operation and did it again and now it says it's up to date. reinoud@router-dev:~/Downloads/kernel_current$ git merge xfs-for-linus-4.7-rc1 Already up-to-date. reinoud@router-dev:~/Downloads/kernel_current$ git status On branch xfsdev-merge Is this correct, can I now build and test? > > -Eric > >> reinoud@router-dev:~/Downloads/kernel_current$ git remote update >> Fetching origin >> Fetching xfsdev >> fatal: remote error: access denied or repository not exported: >> /git/dgc/linux-xfs.git >> error: Could not fetch xfsdev >> >> I don't think I have access to git.kernel.org in terms of pushing. :) >> Or am I doing something else wrong. >> Forgive the trivial question. >> >> Btw, I started in the most current linus git tree.... or should I git >> 4.6.y and then do your suggestions? >> >> Thanks, >> >> Reinoud. >> >>> >>> And that should give you the XFS changes for 4.7-rc1 in a vanilla 4.6 >>> tree. This merge is one of the things I test (i.e. send to my test >>> machiens for a round of xfstests and other stress) before sending a >>> pull request to Linus, so it should work just fine. >>> >>> Cheers, >>> >>> Dave. >>> -- >>> Dave Chinner >>> david@xxxxxxxxxxxxx >> _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
