Re: linux-next: Tree for Apr 9

From: Sedat Dilek
Date: Tue Apr 09 2013 - 10:32:21 EST


On Tue, Apr 9, 2013 at 4:23 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Sedat,
>
> On Tue, 9 Apr 2013 16:11:50 +0200 Sedat Dilek <sedat.dilek@xxxxxxxxx> wrote:
>>
>> [ CC Al Viro ]
>
> You forgot to do that ...
>
>> Is there a "magic" git-command to revert all commits coming from your
>> latest vfs-merge (commit c1c04d3667608a630ae0821995b465a523e83fb1)?
>>
>> 2013-04-09 11:36 Stephen Rothwell â Mââ â â â â â â â 20130405/vfs
>
> You would normally do "git revert -m 1 c1c04d366760". However, that does
> not revert cleanly in today's linux-next (due to more patches modifying
> the files involved).
>

Just wanted to improve my git Know-How.

>> After reverting all these commits I would like to pull-in latest
>> vfs.git#for-next.
>
> It would probably be easier to wait for tomorrow's linux-next. Or just
> test Al's tree in its own.

Doug reported problems on his way "reverting the current vfs stuff"
and Al's new tree was reported as OK.
A lot of merge-conflicts... that's what I see when trying to pull in
Al's tree in today's Linux-Next.
So, I better wait for tommorrow.

Anyway, a warning in your CHANGELOG is very much appreciated on such
KNOWN ISSUES.

Regards,
- Sedat -

> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/