Patchwork [GIT,PULL] ARM: Two more fixes for merge window fallout

login
register
mail settings
Submitter Olof Johansson
Date March 30, 2012, 11:20 p.m.
Message ID <CAOesGMjU5tehTf7+nYQv1_7a=+gGN2hVYUdh1g_BF=WRYj0hgg@mail.gmail.com>
Download mbox
Permalink /patch/149798/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes

Comments

Olof Johansson - March 30, 2012, 11:20 p.m.
Linus,

Apologies for back-to-back fixes pull requests, but one of the patches
below are the kind we'll see posted over and over if we don't send it
in. I hadn't done the full sanity-check of defconfig builds by the
time I sent up the other fixes yesterday or I would have included it
then.

After this we're likely to switch to a more regular frequency of
sending fixes up.



Thanks,

-Olof



The following changes since commit f00e9b11863abdb837e555a2b1e3417e8b5d80dd:

  Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
(2012-03-29 20:36:18 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes

for you to fetch changes up to d3c7de52096a201ac188adb95b8351b90cab11f1:

  ARM: clps711x: fix missing include file (2012-03-30 15:44:48 -0700)

----------------------------------------------------------------
ARM: A few more platform fixes for include file fallout

Two patches, one dealing with the system.h fallout, the other is a missing
linux/bug.h in a place where ARRAY_SIZE() is used.

----------------------------------------------------------------
Olof Johansson (2):
      ARM: fix builds due to missing <asm/system_misc.h> includes
      ARM: clps711x: fix missing include file

 arch/arm/mach-at91/at91x40.c        |    1 +
 arch/arm/mach-at91/setup.c          |    1 +
 arch/arm/mach-clps711x/edb7211-mm.c |    1 +
 arch/arm/mach-h720x/common.c        |    1 +
 arch/arm/mach-imx/mm-imx3.c         |    1 +
 arch/arm/mach-imx/mm-imx5.c         |    1 +
 arch/arm/mach-ixp23xx/core.c        |    1 +
 arch/arm/mach-ixp4xx/common.c       |    1 +
 arch/arm/mach-pxa/raumfeld.c        |    2 ++
 arch/arm/mach-shark/core.c          |    1 +
 arch/arm/mach-w90x900/dev.c         |    1 +
 arch/arm/plat-s3c24xx/cpu.c         |    1 +
 12 files changed, 13 insertions(+)
Linus Torvalds - March 31, 2012, midnight
On Fri, Mar 30, 2012 at 4:20 PM, Olof Johansson <olof@lixom.net> wrote:
>
> are available in the git repository at:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes

Hmm. I *think* you meant to ask me to pull the "fixes-for-linus" tag,
which points at the same commit as the "fixes" branch. No?

You might want to double-check whatever script or workflow you use to
generate these pull requests.

               Linus
Olof Johansson - March 31, 2012, 1:18 a.m.
On Fri, Mar 30, 2012 at 5:00 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Fri, Mar 30, 2012 at 4:20 PM, Olof Johansson <olof@lixom.net> wrote:
>>
>> are available in the git repository at:
>>
>>  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git fixes
>
> Hmm. I *think* you meant to ask me to pull the "fixes-for-linus" tag,
> which points at the same commit as the "fixes" branch. No?

Yes, that's correct.

> You might want to double-check whatever script or workflow you use to
> generate these pull requests.

Hmm, I had 'fixes' checked out locally, and used regular git request-pull.

Oh! I know what it was. I pushed the branch before I pushed the tag,
so when I generated the request the branch had propagated out from ra
to git.kernel.org but not the tag.

Since the branch matched but no tag did, request-pull used it and took
the local tag contents for the message so I didn't notice the
difference.

Thanks for the sanity check, I'll double-check in the future.


-Olof