On Wed, Jun 8, 2016 at 9:42 PM, Reinoud Koornstra
<reinoudkoornstra@xxxxxxxxx> wrote:
> 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. :)
I've tested the way you and Dave described.
Indeed, I do not see the issues appearing in that xfsdev tree.
So it works good there.
For verification, I tried when I was upon this state (so this is a good state):
reinoud@router-dev:~/Downloads/kernel_current$ git log | more
commit f56c2f323f026bd9cf942f34f8a634ccd88b6ed7
Merge: 2dcd0af 555b67e
Author: Reinoud Koornstra <reinoudkoornstra@xxxxxxxxx>
Date: Wed Jun 8 21:31:32 2016 -0600
Merge tag 'xfs-for-linus-4.7-rc1' into xfsdev-merge
xfs: update for 4.7-rc1
Merge local tree
Changes in this update:
o fixes for mount line parsing, sparse warnings, read-only compat
feature remount behaviour
o allow fast path symlink lookups for inline symlinks.
o attribute listing cleanups
o writeback goes direct to bios rather than indirecting through
bufferheads
o transaction allocation cleanup
o optimised kmem_realloc
o added configurable error handling for metadata write errors,
changed default error handling behaviour from "retry forever" to
"retry until unmount then fail"
o fixed several inode cluster writeback lookup vs reclaim race
conditions
o fixed inode cluster writeback checking wrong inode after lookup
o fixed bugs where struct xfs_inode freeing wasn't actually RCU safe
o cleaned up inode reclaim tagging
commit 555b67e4e729ca544bb4028ab12e532c68b70ddb
Merge: 544ad71 ad438c4
Author: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Fri May 20 10:34:00 2016 +1000
Merge branch 'xfs-4.7-inode-reclaim' into for-next
commit 544ad71fc8e20fb3a6f50f00d487751492cd8409
Merge: 2a4ad58 e6b3bb7
Author: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Fri May 20 10:33:38 2016 +1000
Merge branch 'xfs-4.7-error-cfg' into for-next
commit 2a4ad5894c819978dca5595396d54d51c3aca694
Merge: a7792aa 6e3e6d5
Author: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Fri May 20 10:33:17 2016 +1000
Merge branch 'xfs-4.7-misc-fixes' into for-next
Thanks, Reinoud.
>
> 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
>>>
|