On Fri, 2008-08-15 at 07:54 +0000, Leann Ogasawara wrote:
> Hi TJ,
>
> Thanks for the clarification. This latest patch you pointed me to also
> seems to already be in the Hardy and Intrepid trees:
>
> ogasawara@yoji:~/ubuntu-hardy$ git log b87e81e5c6e64ae0eae3b4f61bf07bfeec856184
> commit b87e81e5c6e64ae0eae3b4f61bf07bfeec856184
>
> Author: <email address hidden> <email address hidden>
>
> Date: Tue Apr 15 14:34:49 2008 -0700
Leann, are you sure that is from ubuntu-hardy master branch? What I mean
is, I think it is from the <mainline>/master remote tracking branch if
you have one.
If I check the commits in master against one of the files touched the
commit b87e81e5 doesn't show up:
ubuntu-hardy$ git-status
# On branch master
nothing to commit (working directory clean)
On Fri, 2008-08-15 at 07:54 +0000, Leann Ogasawara wrote: yoji:~/ ubuntu- hardy$ git log b87e81e5c6e64ae 0eae3b4f61bf07b feec856184 0eae3b4f61bf07b feec856184
> Hi TJ,
>
> Thanks for the clarification. This latest patch you pointed me to also
> seems to already be in the Hardy and Intrepid trees:
>
> ogasawara@
> commit b87e81e5c6e64ae
>
> Author: <email address hidden> <email address hidden>
>
> Date: Tue Apr 15 14:34:49 2008 -0700
Leann, are you sure that is from ubuntu-hardy master branch? What I mean
is, I think it is from the <mainline>/master remote tracking branch if
you have one.
If I check the commits in master against one of the files touched the
commit b87e81e5 doesn't show up:
ubuntu-hardy$ git-status
# On branch master
nothing to commit (working directory clean)
ubuntu-hardy$ git-log -1 --pretty=oneline 970df1bcd741143 00e0f7707a UBUNTU: if_arp: add a WiMax pseudo header
b180a9b27d1875b
ubuntu-hardy$ git-log --pretty=format:"%h %ci %s" -- arch/x86/pci/pci.c | grep b87e81e5
ubuntu-hardy$
If I check the most recent tag prior to that commit I get: rc9-67- gb87e81e
ubuntu-hardy$ git-describe b87e81e5
v2.6.25-
ubuntu-hardy$ git-describe --contains b87e81e5
v2.6.25~6
which comes from my remote mainline tracking branch:
ubuntu-hardy$ git-remote show mainline SourceCode/ linux/linux- 2.6/.git bugzilla- 10396 master pci-2.6 pci-iomem pci-resource- allocation- debug
* remote mainline
URL: /home/all/
Tracked remote branches
fix-