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] [day] [month] [year] [list]
Date:	Wed, 28 Nov 2012 12:35:32 -0800
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Dave Airlie <airlied@...il.com>
Cc:	Dave Airlie <airlied@...ux.ie>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	DRI mailing list <dri-devel@...ts.freedesktop.org>
Subject: Re: [git pull] drm fixes

[ Hmm. For some reason this seems to have never gone out, and was in
my drafts folder. If you get it twice, my bad ]

On Thu, Nov 22, 2012 at 12:57 AM, Dave Airlie <airlied@...il.com> wrote:
>
> Doh!, yes I picked wrong place to generate report from, okay here is
> one corresponding to what you saw,

You should never even need to "pick" any place to generate the report from.

Just do something like

   git fetch upstream

(where "upstream" is a branch description for the upstream repository
- see "man git-remote" etc, although you can obviously always just
type out the whole repo details etc in full if you would want to).
Note the "fetch" - not pull - you just want to get it, not merge it.

Then you can just point git pull-request at the upstream, and git wll
figure out what the latest common point is. No need for you to
manually try to figure it out.

                   Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ