1. 09 Nov, 2011 1 commit
  2. 08 Nov, 2011 3 commits
  3. 07 Nov, 2011 21 commits
    • Russell King's avatar
      Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage" · abf015f0
      Russell King authored
      This reverts commit 2b034922.
      
      Will Deacon reports:
      
      This is causing kexec to fail.
      
      The symptoms are that the .init.text section is not loaded as part of the
      new kernel image, so when we try to do the SMP/UP fixups we hit a whole sea
      of poison left there by the previous kernel.
      
      So my guess is that machine_kexec_prepare *is* too early for preparing the
      reboot_code_buffer and, unless anybody has a good reason not to, I'd like to
      revert the patch causing these problems.
      Reported-by: default avatarWill Deacon <will.deacon@arm.com>
      abf015f0
    • Linus Torvalds's avatar
      Revert "hvc_console: display printk messages on console." · 31555213
      Linus Torvalds authored
      This reverts commit 36116245.
      
      It causes an infinite loop when booting Linux under Xen, as so:
      
        [    2.382984] console [hvc0] enabled
        [    2.382984] console [hvc0] enabled
        [    2.382984] console [hvc0] enabled
        ...
      
      as reported by Konrad Rzeszutek Wilk.  And Rusty reports the same for
      lguest.  He goes on to say:
      
         "This is not a concurrency problem: the issue seems to be that
          calling register_console() twice on the same struct console is a bad
          idea."
      
      and Greg says he'll fix it up properly at some point later. Revert for now.
      Reported-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Reported-by: default avatarRusty Russell <rusty@ozlabs.org>
      Requested-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Miche Baker-Harvey <miche@google.com>
      Cc: Greg Kroah-Hartman <gregkh@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      31555213
    • Michael Neuling's avatar
      powerpc: fix building hvc_opal.c · 0084e475
      Michael Neuling authored
      Fix building following build error:
      
        drivers/tty/hvc/hvc_opal.c:244:12: error: 'THIS_MODULE' undeclared here (not in a function)
      Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
      [ New file from powerpc tree not following the new rules from the
        module.h split, both of which were merged today.  - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0084e475
    • Linus Torvalds's avatar
      Merge branch 'upstream/jump-label-noearly' of... · b32fc0a0
      Linus Torvalds authored
      Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
      
      * 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        jump-label: initialize jump-label subsystem much earlier
        x86/jump_label: add arch_jump_label_transform_static()
        s390/jump-label: add arch_jump_label_transform_static()
        jump_label: add arch_jump_label_transform_static() to optimise non-live code updates
        sparc/jump_label: drop arch_jump_label_text_poke_early()
        x86/jump_label: drop arch_jump_label_text_poke_early()
        jump_label: if a key has already been initialized, don't nop it out
        stop_machine: make stop_machine safe and efficient to call early
        jump_label: use proper atomic_t initializer
      
      Conflicts:
       - arch/x86/kernel/jump_label.c
      	Added __init_or_module to arch_jump_label_text_poke_early vs
      	removal of that function entirely
       - kernel/stop_machine.c
      	same patch ("stop_machine: make stop_machine safe and efficient
      	to call early") merged twice, with whitespace fix in one version
      b32fc0a0
    • Linus Torvalds's avatar
      Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · 403299a8
      Linus Torvalds authored
      * 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen/dom0: set wallclock time in Xen
        xen: add dom0_op hypercall
        xen/acpi: Domain0 acpi parser related platform hypercall
      403299a8
    • Linus Torvalds's avatar
      Merge branch 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · daedd870
      Linus Torvalds authored
      * 'stable/cleanups-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: use static initializers in xen-balloon.c
        Xen: fix braces and tabs coding style issue in xenbus_probe.c
        Xen: fix braces coding style issue in xenbus_probe.h
        Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c
        Xen: fix braces coding style issue in gntdev.c and grant-table.c
        Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c
        Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c
      
      Fix up trivial whitespace-conflicts in
       drivers/xen/{balloon.c,pci.c,xenbus/xenbus_probe.c}
      daedd870
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 6a6662ce
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (114 commits)
        Btrfs: check for a null fs root when writing to the backup root log
        Btrfs: fix race during transaction joins
        Btrfs: fix a potential btrfs_bio leak on scrub fixups
        Btrfs: rename btrfs_bio multi -> bbio for consistency
        Btrfs: stop leaking btrfs_bios on readahead
        Btrfs: stop the readahead threads on failed mount
        Btrfs: fix extent_buffer leak in the metadata IO error handling
        Btrfs: fix the new inspection ioctls for 32 bit compat
        Btrfs: fix delayed insertion reservation
        Btrfs: ClearPageError during writepage and clean_tree_block
        Btrfs: be smarter about committing the transaction in reserve_metadata_bytes
        Btrfs: make a delayed_block_rsv for the delayed item insertion
        Btrfs: add a log of past tree roots
        btrfs: separate superblock items out of fs_info
        Btrfs: use the global reserve when truncating the free space cache inode
        Btrfs: release metadata from global reserve if we have to fallback for unlink
        Btrfs: make sure to flush queued bios if write_cache_pages waits
        Btrfs: fix extent pinning bugs in the tree log
        Btrfs: make sure btrfs_remove_free_space doesn't leak EAGAIN
        Btrfs: don't wait as long for more batches during SSD log commit
        ...
      6a6662ce
    • Linus Torvalds's avatar
      Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 32aaeffb
      Linus Torvalds authored
      * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
        Revert "tracing: Include module.h in define_trace.h"
        irq: don't put module.h into irq.h for tracking irqgen modules.
        bluetooth: macroize two small inlines to avoid module.h
        ip_vs.h: fix implicit use of module_get/module_put from module.h
        nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
        include: replace linux/module.h with "struct module" wherever possible
        include: convert various register fcns to macros to avoid include chaining
        crypto.h: remove unused crypto_tfm_alg_modname() inline
        uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
        pm_runtime.h: explicitly requires notifier.h
        linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
        miscdevice.h: fix up implicit use of lists and types
        stop_machine.h: fix implicit use of smp.h for smp_processor_id
        of: fix implicit use of errno.h in include/linux/of.h
        of_platform.h: delete needless include <linux/module.h>
        acpi: remove module.h include from platform/aclinux.h
        miscdevice.h: delete unnecessary inclusion of module.h
        device_cgroup.h: delete needless include <linux/module.h>
        net: sch_generic remove redundant use of <linux/module.h>
        net: inet_timewait_sock doesnt need <linux/module.h>
        ...
      
      Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
       - drivers/media/dvb/frontends/dibx000_common.c
       - drivers/media/video/{mt9m111.c,ov6650.c}
       - drivers/mfd/ab3550-core.c
       - include/linux/dmaengine.h
      32aaeffb
    • Linus Torvalds's avatar
      Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux · 208bca08
      Linus Torvalds authored
      * 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
        writeback: Add a 'reason' to wb_writeback_work
        writeback: send work item to queue_io, move_expired_inodes
        writeback: trace event balance_dirty_pages
        writeback: trace event bdi_dirty_ratelimit
        writeback: fix ppc compile warnings on do_div(long long, unsigned long)
        writeback: per-bdi background threshold
        writeback: dirty position control - bdi reserve area
        writeback: control dirty pause time
        writeback: limit max dirty pause time
        writeback: IO-less balance_dirty_pages()
        writeback: per task dirty rate limit
        writeback: stabilize bdi->dirty_ratelimit
        writeback: dirty rate control
        writeback: add bg_threshold parameter to __bdi_update_bandwidth()
        writeback: dirty position control
        writeback: account per-bdi accumulated dirtied pages
      208bca08
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 6aad3738
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: use ->exectute_task for all CDB emulation
        target: remove SCF_EMULATE_CDB_ASYNC
        target: refactor transport_emulate_control_cdb
        target: pass the se_task to the CDB emulation callback
        target: split core_scsi3_emulate_pr
        target: split core_scsi2_emulate_crh
        target: Add generic active I/O shutdown logic
        target: add back error handling in transport_complete_task
        target/pscsi: blk_make_request() returns an ERR_PTR()
        target: Remove core TRANSPORT_FREE_CMD_INTR usage
        target: Make TFO->check_stop_free return free status
        iscsi-target: Fix non-immediate TMR handling
        iscsi-target: Add missing CMDSN_LOWER_THAN_EXP check in iscsit_handle_scsi_cmd
        target: Avoid double list_del for aborted se_tmr_req
        target: Minor cleanups to core_tmr_drain_tmr_list
        target: Fix wrong se_tmr being added to drain_tmr_list
        target: Fix incorrect se_cmd assignment in core_tmr_drain_tmr_list
        target: Check -ENOMEM to signal QUEUE_FULL from fabric callbacks
        tcm_loop: Add explict read buffer memset for SCF_SCSI_CONTROL_SG_IO_CDB
        target: Fix compile warning w/ missing module.h include
      6aad3738
    • Linus Torvalds's avatar
      Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 02ebbbd4
      Linus Torvalds authored
      * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scsi: drop unused Kconfig symbol
        pci: drop unused Kconfig symbol
        stmmac: drop unused Kconfig symbol
        x86: drop unused Kconfig symbol
        powerpc: drop unused Kconfig symbols
        powerpc: 40x: drop unused Kconfig symbol
        mips: drop unused Kconfig symbols
        openrisc: drop unused Kconfig symbols
        arm: at91: drop unused Kconfig symbol
        samples: drop unused Kconfig symbol
        m32r: drop unused Kconfig symbol
        score: drop unused Kconfig symbols
        sh: drop unused Kconfig symbol
        um: drop unused Kconfig symbol
        sparc: drop unused Kconfig symbol
        alpha: drop unused Kconfig symbol
      
      Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
      as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
      should be deleted.
      02ebbbd4
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · addd8c92
      Linus Torvalds authored
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        script/checkpatch.pl: warn about deprecated use of EXTRA_{A,C,CPP,LD}FLAGS
        tags, powerpc: Update tags.sh to support _GLOBAL symbols
        scripts: add extract-vmlinux
      addd8c92
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · a84f6aa6
      Linus Torvalds authored
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/kconfig/nconf: add KEY_HOME / KEY_END for dialog_inputbox
        scripts/kconfig/nconf: fix editing long strings
        scripts/kconfig/nconf: dynamically alloc dialog_input_result
        scripts/kconfig/nconf: fix memmove's length arg
        scripts/kconfig/nconf: fix typo: unknow => unknown
        kconfig: fix set but not used variables
        kconfig: handle SIGINT in menuconfig
        kconfig: fix __enabled_ macros definition for invisible and un-selected symbols
        kconfig: factor code in menu_get_ext_help()
        kbuild: Fix help text not displayed in choice option.
        kconfig/nconf: nuke unreferenced `nohelp_text'
        kconfig/streamline_config.pl: merge local{mod,yes}config
        kconfig/streamline_config.pl: use options to determine operating mode
        kconfig/streamline_config.pl: directly access LSMOD from the environment
      a84f6aa6
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · dede6faa
      Linus Torvalds authored
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        Kbuild: append missing-syscalls to the default target list
        genksyms: Regenerate lexer and parser
        genksyms: Do not expand internal types
        genksyms: Minor parser cleanup
        Makefile: remove a duplicated line
        fixdep: fix extraneous dependencies
        scripts/Makefile.build: do not reference EXTRA_CFLAGS as CFLAGS replacement
        kbuild: prevent make from deleting _shipped files
        kbuild: Do not delete empty files in make distclean
      dede6faa
    • Linus Torvalds's avatar
      hid/apple: modern macbook airs use the standard apple function key translations · 21404b77
      Linus Torvalds authored
      This removes the use of the special "macbookair_fn_keys" keyboard
      translation table for the MacBookAir4,x models (ie the 2011 refresh).
      They use the standard apple_fn_keys[] translation.  Apparently only the
      old MacBook Air's need a different translation table.
      
      This mirrors the change that commit da617c7c ("HID: consolidate
      MacbookAir 4,1 mappings") did for the WELLSPRING6A ones, but does it for
      the WELLSPRING6 model used on the MacBookAir4,2.
      Reported-and-tested-by: default avatarDirk Hohndel <hohndel@infradead.org>
      Cc: Jiri Kosina <jkosina@suse.cz>
      Cc: Joshua V Dillon <jvdillon@gmail.com>
      Cc: Chase Douglas <chase.douglas@canonical.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      21404b77
    • Linus Torvalds's avatar
      Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 06d38148
      Linus Torvalds authored
      * 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        net: xen-netback: use API provided by xenbus module to map rings
        block: xen-blkback: use API provided by xenbus module to map rings
        xen: use generic functions instead of xen_{alloc, free}_vm_area()
      06d38148
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 5d5a8d2d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        ceph/super.c: quiet sparse noise
        ceph/mds_client.c: quiet sparse noise
        ceph: use new D_COMPLETE dentry flag
        ceph: clear parent D_COMPLETE flag when on dentry prune
      5d5a8d2d
    • Linus Torvalds's avatar
      Merge git://github.com/rustyrussell/linux · d4a2e61f
      Linus Torvalds authored
      * git://github.com/rustyrussell/linux:
        module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
        module: Enable dynamic debugging regardless of taint
      d4a2e61f
    • Linus Torvalds's avatar
      Merge branch 'rmobile-latest' of git://github.com/pmundt/linux-sh · 0e4c9dc2
      Linus Torvalds authored
      * 'rmobile-latest' of git://github.com/pmundt/linux-sh: (21 commits)
        ARM: mach-shmobile: ag5evm needs CONFIG_I2C
        ARM: mach-shmobile: sh73a0 and AG5EVM PINT support
        ARM: mach-shmobile: Add support for PINT though INTC macros
        ARM: mach-shmobile: SDHI0 GPIO hotplug for AG5EVM
        ARM: mach-shmobile: Use common INTC IRQ code on sh73a0
        ARM: mach-shmobile: Use common INTC IRQ code on sh7372
        ARM: mach-shmobile: Use common INTC IRQ code on sh7377
        ARM: mach-shmobile: Use common INTC IRQ code on sh7367
        ARM: mach-shmobile: sh73a0 GPIO IRQ support
        ARM: sh7372 ap4evb NOR Flash USB boot fix
        ARM: mach-shmobile: sh7372 Mackerel NOR Flash USB boot fix
        sh: intc: Allow triggering on both edges for ARM SoCs
        ARM: mach-shmobile: Break out INTC IRQ code
        ARM: mach-shmobile: Kota2 SDHI0 and SDHI1 support
        ARM: mach-shmobile: Kota2 SCIFA4 and SCIFB support
        ARM: mach-shmobile: Kota2 MMCIF support
        ARM: mach-shmobile: Kota2 GPIO LEDs support
        ARM: mach-shmobile: Kota2 GPIO Keys support
        ARM: mach-shmobile: Kota2 KEYSC support
        ARM: mach-shmobile: Kota2 SCIFA2 and SMSC911X support
        ...
      0e4c9dc2
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 1197ab29
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
        powerpc/p3060qds: Add support for P3060QDS board
        powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
        powerpc/85xx: Make kexec to interate over online cpus
        powerpc/fsl_booke: Fix comment in head_fsl_booke.S
        powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
        powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
        powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
        powerpc/86xx: Correct Gianfar support for GE boards
        powerpc/cpm: Clear muram before it is in use.
        drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
        powerpc/fsl_msi: add support for "msi-address-64" property
        powerpc/85xx: Setup secondary cores PIR with hard SMP id
        powerpc/fsl-booke: Fix settlbcam for 64-bit
        powerpc/85xx: Adding DCSR node to dtsi device trees
        powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
        powerpc/85xx: fix PHYS_64BIT selection for P1022DS
        powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
        powerpc: respect mem= setting for early memory limit setup
        powerpc: Update corenet64_smp_defconfig
        powerpc: Update mpc85xx/corenet 32-bit defconfigs
        ...
      
      Fix up trivial conflicts in:
       - arch/powerpc/configs/40x/hcu4_defconfig
      	removed stale file, edited elsewhere
       - arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
      	added opal and gelic drivers vs added ePAPR driver
       - drivers/tty/serial/8250.c
      	moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support
      1197ab29
    • Linus Torvalds's avatar
      Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · ec773e99
      Linus Torvalds authored
      * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
        ARM: PXA: fix gpio-pxa.h build errors
        ARM: 7142/1: davinci: mark GPIO implementation complex
        ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
        ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
        ARM: PXA: fix lubbock PCMCIA driver build error
      ec773e99
  4. 06 Nov, 2011 15 commits