1. 29 Oct, 2011 3 commits
  2. 25 Oct, 2011 17 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 59e52534
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
        MAINTAINERS: linux-m32r is moderated for non-subscribers
        linux@lists.openrisc.net is moderated for non-subscribers
        Drop default from "DM365 codec select" choice
        parisc: Kconfig: cleanup Kernel page size default
        Kconfig: remove redundant CONFIG_ prefix on two symbols
        cris: remove arch/cris/arch-v32/lib/nand_init.S
        microblaze: add missing CONFIG_ prefixes
        h8300: drop puzzling Kconfig dependencies
        MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
        tty: drop superfluous dependency in Kconfig
        ARM: mxc: fix Kconfig typo 'i.MX51'
        Fix file references in Kconfig files
        aic7xxx: fix Kconfig references to READMEs
        Fix file references in drivers/ide/
        thinkpad_acpi: Fix printk typo 'bluestooth'
        bcmring: drop commented out line in Kconfig
        btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
        doc: raw1394: Trivial typo fix
        CIFS: Don't free volume_info->UNC until we are entirely done with it.
        treewide: Correct spelling of successfully in comments
        ...
      59e52534
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm · 73692d9b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
        apm-emulation: use wait_event_freezable() instead of freezer_[do_not_]count()
      73692d9b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 31dced41
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (61 commits)
        HID: hid-magicmouse: Magic Trackpad has 1 button, not 2
        HID: Add device IDs for more SJOY adapters
        HID: primax: remove spurious dependency
        HID: support primax keyboards violating USB HID spec
        HID: usbhid: cancel timer for retry synchronously
        HID: wacom: Set input bits before registration
        HID: consolidate MacbookAir 4,1 mappings
        HID: MacbookAir4,1 and MacbookAir4,2 need entry in hid_mouse_ignore_list[]
        HID: Add support MacbookAir 4,1 keyboard
        HID: hidraw: open count should not increase if error
        HID: hiddev: potential info leak in hiddev_ioctl()
        HID: multitouch: decide if hid-multitouch needs to handle mt devices
        HID: add autodetection of multitouch devices
        HID: "hid-logitech" driver with Logitech Driving Force GT
        HID: hid-logitech-dj: fix off by one
        HID: hidraw: protect hidraw_disconnect() better
        HID: hid-multitouch: add support for the IDEACOM 6650 chip
        HID: Add full support for Logitech Unifying receivers
        HID: hidraw: free list for all error in hidraw_open
        HID: roccat: Kone now reports external profile changes via roccat device
        ...
      31dced41
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 7c1953dd
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (62 commits)
        target: Fix compile warning w/ missing module.h include
        target: Remove legacy se_task->task_timer and associated logic
        target: Fix incorrect transport_sent usage
        target: re-use the command S/G list for single-task commands
        target: Fix BIDI t_task_cdb handling in transport_generic_new_cmd
        target: remove transport_allocate_tasks
        target: merge transport_new_cmd_obj into transport_generic_new_cmd
        target: remove the task_sg_bidi field se_task and pSCSI BIDI support
        target: transport_subsystem_check_init cleanups
        target: use a workqueue for I/O completions
        target: remove unused TRANSPORT_ states
        target: remove TRANSPORT_DEFERRED_CMD state
        target: remove the TRANSPORT_REMOVE state
        target: move depth_left manipulation out of transport_generic_request_failure
        target: stop task timers earlier
        target: remove TF_TIMER_STOP
        target: factor some duplicate code for stopping a task
        target: fix list walking in transport_free_dev_tasks
        target: use transport_cmd_check_stop_to_fabric consistently
        target: do not pass the queue object to transport_remove_cmd_from_queue
        ...
      7c1953dd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 1bc67188
      Linus Torvalds authored
      * 'for-linus' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (81 commits)
        ARM: 7133/1: SMP: fix per cpu timer setup before the cpu is marked online
        ARM: 7129/1: Add __arm_ioremap_exec for mapping external memory as MT_MEMORY
        ARM: 7136/1: pl330: Fix a race condition
        ARM: smp: fix clipping of number of CPUs
        ARM: 7137/1: Fix error upon adding LL debug
        ARM: Add a few machine types to mach-types
        ARM: 7130/1: dev_archdata: add private iommu extension
        ARM: 7125/1: Add unwinding annotations for 64bit division functions
        ARM: 7120/1: remove bashism in check for multiple zreladdrs
        ARM: 7118/1: rename temp variable in read*_relaxed()
        ARM: 6217/4: mach-realview: expose PB1176 ROM using physmap and map_rom
        ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage
        ARM: 7062/1: cache: detect PIPT I-cache using CTR
        ARM: platform fixups: remove mdesc argument to fixup function
        ARM: 7017/1: Use generic BUG() handler
        ARM: 7102/1: mach-integrator: update defconfig
        ARM: 7087/2: mach-integrator: get timer frequency from clock
        ARM: 7086/2: mach-integrator: modernize clock event registration
        ARM: 7085/2: mach-integrator: clockevent supports oneshot mode
        ARM: 7084/1: mach-integrator: retire some timer macros
        ...
      1bc67188
    • Jiri Kosina's avatar
      Merge branch 'upstream' into for-linus · b3aec7b6
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-core.c
      	drivers/hid/hid-ids.h
      b3aec7b6
    • Jiri Kosina's avatar
      Merge branch 'upstream-fixes' into for-linus · f6f12427
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-wacom.c
      f6f12427
    • Jiri Kosina's avatar
    • Linus Torvalds's avatar
      Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security · 36b8d186
      Linus Torvalds authored
      * 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
        TOMOYO: Fix incomplete read after seek.
        Smack: allow to access /smack/access as normal user
        TOMOYO: Fix unused kernel config option.
        Smack: fix: invalid length set for the result of /smack/access
        Smack: compilation fix
        Smack: fix for /smack/access output, use string instead of byte
        Smack: domain transition protections (v3)
        Smack: Provide information for UDS getsockopt(SO_PEERCRED)
        Smack: Clean up comments
        Smack: Repair processing of fcntl
        Smack: Rule list lookup performance
        Smack: check permissions from user space (v2)
        TOMOYO: Fix quota and garbage collector.
        TOMOYO: Remove redundant tasklist_lock.
        TOMOYO: Fix domain transition failure warning.
        TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
        TOMOYO: Simplify garbage collector.
        TOMOYO: Fix make namespacecheck warnings.
        target: check hex2bin result
        encrypted-keys: check hex2bin result
        ...
      36b8d186
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · cd85b557
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Finally remove leftover markers sections
        m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
        m68k/mac: Fix compiler warning in via_read_time()
        zorro: Fix four checkpatch warnings
      cd85b557
    • Russell King's avatar
      Merge branch 'misc' into for-linus · bdf4e948
      Russell King authored
      Conflicts:
      	arch/arm/mach-integrator/integrator_ap.c
      bdf4e948
    • Linus Torvalds's avatar
      Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and... · 04a87524
      Linus Torvalds authored
      Merge branches 'stable/drivers-3.2', 'stable/drivers.bugfixes-3.2' and 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/drivers-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xenbus: don't rely on xen_initial_domain to detect local xenstore
        xenbus: Fix loopback event channel assuming domain 0
        xen/pv-on-hvm:kexec: Fix implicit declaration of function 'xen_hvm_domain'
        xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel
        xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable
        xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel
        xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports
        xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive
      
      * 'stable/drivers.bugfixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pciback: Check if the device is found instead of blindly assuming so.
        xen/pciback: Do not dereference psdev during printk when it is NULL.
        xen: remove XEN_PLATFORM_PCI config option
        xen: XEN_PVHVM depends on PCI
        xen/pciback: double lock typo
        xen/pciback: use mutex rather than spinlock in vpci backend
        xen/pciback: Use mutexes when working with Xenbus state transitions.
        xen/pciback: miscellaneous adjustments
        xen/pciback: use mutex rather than spinlock in passthrough backend
        xen/pciback: use resource_size()
      
      * 'stable/pci.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pci: support multi-segment systems
        xen-swiotlb: When doing coherent alloc/dealloc check before swizzling the MFNs.
        xen/pci: make bus notifier handler return sane values
        xen-swiotlb: fix printk and panic args
        xen-swiotlb: Fix wrong panic.
        xen-swiotlb: Retry up three times to allocate Xen-SWIOTLB
        xen-pcifront: Update warning comment to use 'e820_host' option.
      04a87524
    • Russell King's avatar
      Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0',... · 06afb1a0
      Russell King authored
      Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus
      06afb1a0
    • Linus Torvalds's avatar
      Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of... · 31018acd
      Linus Torvalds authored
      Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/bug.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/p2m/debugfs: Make type_name more obvious.
        xen/p2m/debugfs: Fix potential pointer exception.
        xen/enlighten: Fix compile warnings and set cx to known value.
        xen/xenbus: Remove the unnecessary check.
        xen/irq: If we fail during msi_capability_init return proper error code.
        xen/events: Don't check the info for NULL as it is already done.
        xen/events: BUG() when we can't allocate our event->irq array.
      
      * 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: Fix selfballooning and ensure it doesn't go too far
        xen/gntdev: Fix sleep-inside-spinlock
        xen: modify kernel mappings corresponding to granted pages
        xen: add an "highmem" parameter to alloc_xenballooned_pages
        xen/p2m: Use SetPagePrivate and its friends for M2P overrides.
        xen/p2m: Make debug/xen/mmu/p2m visible again.
        Revert "xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set."
      31018acd
    • Linus Torvalds's avatar
      Merge branch 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 5eef150c
      Linus Torvalds authored
      * 'stable/e820-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: release all pages within 1-1 p2m mappings
        xen: allow extra memory to be in multiple regions
        xen: allow balloon driver to use more than one memory region
        xen/balloon: simplify test for the end of usable RAM
        xen/balloon: account for pages released during memory setup
      5eef150c
    • Josh Stone's avatar
      x86: Fix compilation bug in kprobes' twobyte_is_boostable · 315eb8a2
      Josh Stone authored
      When compiling an i386_defconfig kernel with gcc-4.6.1-9.fc15.i686, I
      noticed a warning about the asm operand for test_bit in kprobes'
      can_boost.  I discovered that this caused only the first long of
      twobyte_is_boostable[] to be output.
      
      Jakub filed and fixed gcc PR50571 to correct the warning and this output
      issue.  But to solve it for less current gcc, we can make kprobes'
      twobyte_is_boostable[] non-const, and it won't be optimized out.
      
      Before:
      
          CC      arch/x86/kernel/kprobes.o
        In file included from include/linux/bitops.h:22:0,
                         from include/linux/kernel.h:17,
                         from [...]/arch/x86/include/asm/percpu.h:44,
                         from [...]/arch/x86/include/asm/current.h:5,
                         from [...]/arch/x86/include/asm/processor.h:15,
                         from [...]/arch/x86/include/asm/atomic.h:6,
                         from include/linux/atomic.h:4,
                         from include/linux/mutex.h:18,
                         from include/linux/notifier.h:13,
                         from include/linux/kprobes.h:34,
                         from arch/x86/kernel/kprobes.c:43:
        [...]/arch/x86/include/asm/bitops.h: In function ‘can_boost.part.1’:
        [...]/arch/x86/include/asm/bitops.h:319:2: warning: use of memory input
              without lvalue in asm operand 1 is deprecated [enabled by default]
      
        $ objdump -rd arch/x86/kernel/kprobes.o | grep -A1 -w bt
             551:	0f a3 05 00 00 00 00 	bt     %eax,0x0
                                554: R_386_32	.rodata.cst4
      
        $ objdump -s -j .rodata.cst4 -j .data arch/x86/kernel/kprobes.o
      
        arch/x86/kernel/kprobes.o:     file format elf32-i386
      
        Contents of section .data:
         0000 48000000 00000000 00000000 00000000  H...............
        Contents of section .rodata.cst4:
         0000 4c030000                             L...
      
      Only a single long of twobyte_is_boostable[] is in the object file.
      
      After, without the const on twobyte_is_boostable:
      
        $ objdump -rd arch/x86/kernel/kprobes.o | grep -A1 -w bt
             551:	0f a3 05 20 00 00 00 	bt     %eax,0x20
                                554: R_386_32	.data
      
        $ objdump -s -j .rodata.cst4 -j .data arch/x86/kernel/kprobes.o
      
        arch/x86/kernel/kprobes.o:     file format elf32-i386
      
        Contents of section .data:
         0000 48000000 00000000 00000000 00000000  H...............
         0010 00000000 00000000 00000000 00000000  ................
         0020 4c030000 0f000200 ffff0000 ffcff0c0  L...............
         0030 0000ffff 3bbbfff8 03ff2ebb 26bb2e77  ....;.......&..w
      
      Now all 32 bytes are output into .data instead.
      Signed-off-by: 's avatarJosh Stone <jistone@redhat.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Cc: Jakub Jelinek <jakub@redhat.com>
      Cc: stable@kernel.org
      Signed-off-by: 's avatarLinus Torvalds <torvalds@linux-foundation.org>
      315eb8a2
    • Nicholas Bellinger's avatar
      target: Fix compile warning w/ missing module.h include · b91bf5bf
      Nicholas Bellinger authored
      This patch fixes the following compile warning in target_core_cdb.c in
      recent linux-next code due to the new use of EXPORT_SYMBOL() for
      target_get_task_cdb().
      
      drivers/target/target_core_cdb.c:1316: warning: data definition has no type or storage class
      drivers/target/target_core_cdb.c:1316: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’
      drivers/target/target_core_cdb.c:1316: warning: parameter names (without types) in function declaration
      
      Cc: Christoph Hellwig <hch@lst.de>
      Signed-off-by: 's avatarNicholas Bellinger <nab@linux-iscsi.org>
      b91bf5bf
  3. 24 Oct, 2011 20 commits