netdev - Re: net-2.6.25 being rebased...

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20071211.130858.134618588.davem@davemloft.net>
Date:	Tue, 11 Dec 2007 13:08:58 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	joe@...ches.com
Cc:	netdev@...r.kernel.org
Subject: Re: net-2.6.25 being rebased...

From: Joe Perches <joe@...ches.com>
Date: Tue, 11 Dec 2007 13:04:59 -0800

> On Tue, 2007-12-11 at 11:56 -0800, David Miller wrote:
> > The rebase of net-2.6.25 is complete
> 
> I have an earlier unmodified git repository of net-2.6.25.
> Does anyone know the appropriate git commands to resync
> to the rebased content?
> 
> $ git branch
> * master
> $ git-pull
> [...]
> Automatic merge failed; fix conflicts and then commit the result.

Easiest thing to do is do a quick local clone of Linus's current tree
(you do have one of these around right? :-) and then pull in from the
rebased tree.

bash$ git clone linux-2.6/.git net-2.6.25
bash$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html