[Natty] [ti-omap4] [Pull Request]: 2.6.38.2 based updates

Bryan Wu bryan.wu at canonical.com
Thu Apr 14 00:20:51 UTC 2011


On Wed, Apr 13, 2011 at 4:53 PM, Dechesne, Nicolas <n-dechesne at ti.com> wrote:
>
>
> On Thu, Apr 14, 2011 at 1:33 AM, Bryan Wu <bryan.wu at canonical.com> wrote:
>>
>> in ti-omap4 tree, I just wanna get all the patches on top of a commit
>> which is 2.6.38 kernel release. So I found that SHA ID of that commit
>> and use "git format-patch -o /tmp/ SHA_ID.." to get patches. Very
>> strange, I got lots of patches which are not on top of that commit.
>>
>> So Brad told me to do "git format-patch -1633 -o /tmp" to get 1633
>> patches on top of that 2.6.38 release commit.
>
> you might get confused by the definition of 'on top'. 'on top' as being a
> child, or 'on top' as being more recent.
>
> git log A.. will list all commits who are not an ancestor of A, which are
> reachable in your branch. but some of these commits can be older than A, and
> still aren't ancestor of A.
>

Hmmm, I still fail to understand how come the commits shown in git log
A.. is old than A. Or maybe the time stamps of commits are not in the
right order, but the order in git log A.. should be the order we apply
patches.

> to me git format-patch A.. if run from your branch, will list all the
> commits which are in our OMAP4 branch but not in ubuntu master.
>

Oh, really, so weird. on my side.

git log --online
---
d80d499 OMAP: DSS2: DSI: fix IRQ debug prints
773b30b OMAP: DSS2: DSI: catch DSI errors in send_bta_sync
f34bd46 OMAP: DSS2: DSI: use ISR for BTA in framedone
f36a06e OMAP: DSS2: DSI: use ISR in send_bta_sync
4ae2ddd OMAP: DSS2: DSI: Add ISR support
69b281a OMAP: DSS2: DSI: Restructure IRQ handler
4964111 OMAP: DSS2: FEATURES: DSI PLL parameter cleanup
31ef823 OMAP: DSS2: FEATURES: Functions to return min and max values
of parameters
235e7db OMAP2PLUS: DSS2: FEATURES: Fix usage of dss_reg_field and
dss_clk_source_name
521cb40 Linux 2.6.38
4c4070a Merge branch 'for-rmk-devel-stable' of
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
into devel-stable
5821c95 Merge branch 'davinci-next' of
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
into devel-stable
59766ed Merge branch 'fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
---

So I think the first patch is supposed to generate is commit "235e7db"
OMAP2PLUSS: DSS2 patch. But in following output, the first patch I got
is a patch for i.MX50

---
roc at roc-samos:~/work/natty$ git format-patch 521cb40..
0001-ARM-i.MX50-Rename-devices-mx50.h.patch
0002-arm-mx50_rdp-add-fec-support.patch
0003-arm-mx50_rdp-add-i2c-bus-support.patch
0004-Introduce-VPR200-board.patch
0005-ARM-i.MX53-Add-full-iomux-support-for-mx53.patch
0006-ARM-mx5-Use-dummy-clock-for-the-keypad.patch
0007-ARM-mxs-add-ocotp-read-function.patch
0008-ARM-mxs-mx28evk-read-fec-mac-address-from-ocotp.patch
0009-msm-Add-CPU-queries.patch
0010-msm-Generalize-timer-register-mappings.patch
0011-msm-Generalize-QGIC-registers.patch
0012-msm-io-I-O-register-definitions-for-MSM8960.patch
0013-msm-Physical-offset-for-MSM8960.patch
0014-msm-irqs-8960-Interrupt-map-for-MSM8960.patch
---

Thanks,
-Bryan




More information about the kernel-team mailing list