linux-kernel - Re: [GIT PULL] clockevents/clocksource: 3.12 fixes

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 for Android: free password hash cracker in your pocket

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

Date:	Tue, 12 Nov 2013 19:47:59 +0100
From:	Daniel Lezcano <daniel.lezcano@...aro.org>
To:	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
CC:	Ingo Molnar <mingo@...nel.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	John Stultz <john.stultz@...aro.org>,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [GIT PULL] clockevents/clocksource: 3.12 fixes

On 11/12/2013 07:35 PM, Uwe Kleine-König wrote:
> Hello,
>
> On Tue, Nov 12, 2013 at 03:01:29PM +0100, Daniel Lezcano wrote:
>>
>> Hi Ingo and Thomas,
>>
>> this pull request has the following contain:
>>
>>   * Laurent Pinchard fixed a missing a clk_put in case the
>> registering of the sh_mtu[2] drivers fails.
>>
>>   * Uwe Kleine-König reuse clockevents_config_and_register for the
>> at91rm9200_time timer as it was depending on the patch (commit
>> a4578ea (clockevents: Sanitize ticks to nsec conversion).
>>
>> I don't know why Thomas's patch "clockevents: Sanitize ticks to nsec
>> conversion" appears in the request log because it is not part of the
>> patches interval I specified for git request pull. The diffstat does
>> not show the files which should have been changed by the patch. In
>> any case I kept the changelog untouched since it is what gives me
>> git and maybe someone can tell me why it appears.
> Look at:
>
> 	git log --oneline --graph --boundary 97b9410..42ab380
>
> Then you see that there is Thomas' patch twice. Once the version he
> committed and sent to Linus (97b9410) and once the version that you get
> as part of my pull request (a4578ea). To fix this (assuming you don't
> care much about a stable tree), simply do:
>
> 	git rebase 97b9410 42ab380
>
> and let the result pull.

Ah, yeah, I was suspecting something like that. Thanks a lot for the 
clarification.

   -- Daniel


-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

--
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/