[git pull] x86: declaration fixes - ver2 - Kernel

This is a discussion on [git pull] x86: declaration fixes - ver2 - Kernel ; Hello Ingo, Here are updated patches for x86-tip. The following changes since commit a099a9b18ab434594bb01ed920e8c58574203fa9: Ingo Molnar (1): Merge branch 'out-of-tree' are available in the git repository at: git://git.infradead.org/users/jaswinder/linux-2.6-tip.git master Jaswinder Singh (8): x86: apic_XX.c declare functions before they get used ...

+ Reply to Thread
Results 1 to 3 of 3

Thread: [git pull] x86: declaration fixes - ver2

  1. [git pull] x86: declaration fixes - ver2

    Hello Ingo,

    Here are updated patches for x86-tip.

    The following changes since commit a099a9b18ab434594bb01ed920e8c58574203fa9:
    Ingo Molnar (1):
    Merge branch 'out-of-tree'

    are available in the git repository at:

    git://git.infradead.org/users/jaswinder/linux-2.6-tip.git master

    Jaswinder Singh (8):
    x86: apic_XX.c declare functions before they get used
    x86: vm86_32.c declare functions before they get used
    x86: mm/init_XX.c declare functions before they get used
    x86: mm/fault.c declare do_page_fault before they get used
    x86: mm/ioremap.c declare early_ioremap_debug and early_ioremap_nested as static
    x86: mm/pageattr.c declare arch_report_meminfo before they get used
    x86: mm/pgtable_32.c declare set_pmd_pfn before they get used
    x86: mach-default/setup.c declare no_broadcast before they get used

    arch/x86/mach-default/setup.c | 4 +++-
    arch/x86/mm/fault.c | 3 +--
    arch/x86/mm/init_32.c | 1 +
    arch/x86/mm/ioremap.c | 4 ++--
    include/asm-x86/apic.h | 5 +++++
    include/asm-x86/hw_irq.h | 10 ++++++++++
    include/asm-x86/page_32.h | 1 +
    include/asm-x86/page_64.h | 1 +
    include/asm-x86/pgtable.h | 2 ++
    include/asm-x86/pgtable_32.h | 1 +
    include/asm-x86/syscalls.h | 5 ++++-
    include/asm-x86/traps.h | 4 ++++
    12 files changed, 35 insertions(+), 6 deletions(-)


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [git pull] x86: declaration fixes - ver2


    * Jaswinder Singh wrote:

    > Hello Ingo,
    >
    > Here are updated patches for x86-tip.
    >
    > The following changes since commit a099a9b18ab434594bb01ed920e8c58574203fa9:
    > Ingo Molnar (1):
    > Merge branch 'out-of-tree'


    looks good, but could you please switch over the changes to be based on
    the "upstream" topic branch of your patches, i.e. to tip/x86/prototypes?

    You can do it the following way:

    git checkout master
    git merge tip/master # get latest
    git checkout -b x86/prototypes-for-tip # new pull branch
    git rebase --onto tip/x86/prototypes tip/master # switch

    In theory this should run just fine without any conflicts or manual
    intervention needed.

    If that rebase command ran fine, double-check the end result by looking
    at the output of:

    git log tip/x86/prototypes..x86/prototypes-for-tip

    .... then resend the pull request for the x86/prototypes branch you have,
    by doing something like:

    git-request-pull tip/x86/prototypes git://git.infradead.org/users/jaswinder/linux-2.6-tip.git x86/prototypes-for-tip

    The reason for not basing your branch on tip/master is that we want to
    keep x86/protypes topic a "pure" topic that is mergable without waiting
    for other topics - without mixing it with all other topics that are
    integrated into tip/master.

    And note that x86/prototypes-for-tip is a by-line branch that you should
    not touch after sending the pull request (so that what i pull matches up
    to the summary in the email you send) - you can still evolve your master
    branch with other work, create other branches, etc.

    Let me know if there's any Git hickup.

    Thanks,

    Ingo
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. Re: [git pull] x86: declaration fixes - ver2

    Hello Ingo,

    On Wed, 2008-07-23 at 09:32 +0200, Ingo Molnar wrote:
    > * Jaswinder Singh wrote:


    > The reason for not basing your branch on tip/master is that we want to
    > keep x86/protypes topic a "pure" topic that is mergable without waiting
    > for other topics - without mixing it with all other topics that are
    > integrated into tip/master.
    >


    Sounds great, and if you quickly merge x86/prototypes with Linus tree
    then we stay always up to date.

    Thank you,

    Jaswinder Singh.

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread