linux-kernel - Re: [GIT PULL 05/11] SoC-level changes for tegra and omap

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]

Date:	Wed, 11 Jan 2012 21:29:55 +0100
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	Junio C Hamano <gitster@...ox.com>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Russell King - ARM Linux <linux@....linux.org.uk>,
	linux-kernel@...r.kernel.org, Olof Johansson <olof@...om.net>,
	linux-arm-kernel@...ts.infradead.org
Subject: Re: [GIT PULL 05/11] SoC-level changes for tegra and omap

On Wed, Jan 11, 2012 at 19:12, Arnd Bergmann <arnd@...db.de> wrote:

[...]

> Now let's assume that all dependencies are merged upstream already
> and I just want to send out three pull requests. The first
> pull request generally works fine, though it could be that some
> version of git in the past would include the diff between v3.3-rc2
> and v3.3-rc4 in the diffstat. For the second pull request, I merge
> v3.3 with A and send do 'git request-pull B origin
> tmp-merge-of-upstream-and-A'. This seems to generate the correct
> list of patches, but the wrong diffstat (diffstat also contains
> the diff between v3.3-rc4 and v3.3-rc5, although that is indeed
> part of tmp-merge-of-upstream-and-A. For submitting branch C,
> I have to merge upstream, A, B and the dependencies together
> and then send a pull request against that. This typically also
> includes the external dependencies in the diffstat.

<throwing the bat in the hen house, no idea if this expression exists
in other languages than Dutch>
And all of this would look nice if you would have done a rebase on top of the
latest tagged version of Linus' tree that contains all prerequisites, right?
</throwing...>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
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/