On Tue, Jun 07, 2016 at 10:40:11PM -0600, Reinoud Koornstra wrote:
> On Tue, Jun 7, 2016 at 10:16 PM, Reinoud Koornstra
> <reinoudkoornstra@xxxxxxxxx> wrote:
> > On Tue, Jun 7, 2016 at 5:40 PM, Reinoud Koornstra
> > <reinoudkoornstra@xxxxxxxxx> wrote:
> >> Hi Christoph,
> >>
> >> Now my git log show this:
> >>
> >> 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
> >>
> >> commit a7792aad644a259375002db8c9d9e03fd50bf509
> >> Merge: 5b911354 3ab3ffc
> >> Author: Dave Chinner <david@xxxxxxxxxxxxx>
> >> Date: Fri May 20 10:32:35 2016 +1000
> >>
> >> Is this correct?
> >> If so, let me build and test.
> >> Building it already as we speak, but it would be nice if you could
> >> confirm I'm actually testing the right thing.
> >> Though, wouldn't it be good to repro and get a core file as well?
> >> Or would the test of this commit narrow down the possibilities as well?
> >> Thanks,
> >>
> >> Reinoud.
> >>
> >
> > Ouch, forgive me for not responding inline previously.
> > For what it's worth, i've compiled the kernel and are running it as we
> > speak.
> > Will do testing and let you know.
>
> Ok, going back to commit 555b67e4e729ca544bb4028ab12e532c68b70ddb
> brings the kernel back to 4.6-rc1.
> With that kernel I crash all over the place, so that's something I cannot run.
> Is there a way to get the 4.7-rc1 or rc2 without the commits for XFS?
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
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
|