1. 21 Mar, 2012 9 commits
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6 · f8974cb7
      Linus Torvalds authored
      Pull core device tree changes for Linux v3.4 from Grant Likely:
       "This branch contains a minor documentation addition, a utility
        function for parsing string properties needed by some of the new ARM
        platforms, disables dynamic DT code that isn't used anywhere but on a
        few PPC machines, and exports DT node compatible data to userspace via
        UEVENT properties.  Nothing earth shattering here."
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of: Only compile OF_DYNAMIC on PowerPC pseries and iseries
        arm/dts: OMAP3: Add omap3evm and am335xevm support
        drivercore: Output common devicetree information in uevent
        of: Add of_property_match_string() to find index into a string list
      f8974cb7
    • Linus Torvalds's avatar
      Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6 · c207f3a4
      Linus Torvalds authored
      Pull irq_domain support for all architectures from Grant Likely:
       "Generialize powerpc's irq_host as irq_domain
      
        This branch takes the PowerPC irq_host infrastructure (reverse mapping
        from Linux IRQ numbers to hardware irq numbering), generalizes it,
        renames it to irq_domain, and makes it available to all architectures.
      
        Originally the plan has been to create an all-new irq_domain
        implementation which addresses some of the powerpc shortcomings such
        as not handling 1:1 mappings well, but doing that proved to be far
        more difficult and invasive than generalizing the working code and
        refactoring it in-place.  So, this branch rips out the 'new'
        irq_domain and replaces it with the modified powerpc version (in a
        fully bisectable way of course).  It converts all users over to the
        new API and makes irq_domain selectable on any architecture.
      
        No architecture is forced to enable irq_domain, but the infrastructure
        is required for doing OpenFirmware style irq translations.  It will
        even work on SPARC even though SPARC has it's own mechanism for
        translating irqs at boot time.  MIPS, microblaze, embedded x86 and c6x
        are converted too.
      
        The resulting irq_domain code is probably still too verbose and can be
        optimized more, but that can be done incrementally and is a task for
        follow-on patches."
      
      * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6: (31 commits)
        dt: fix twl4030 for non-dt compile on x86
        mfd: twl-core: Add IRQ_DOMAIN dependency
        devicetree: Add empty of_platform_populate() for !CONFIG_OF_ADDRESS (sparc)
        irq_domain: Centralize definition of irq_dispose_mapping()
        irq_domain/mips: Allow irq_domain on MIPS
        irq_domain/x86: Convert x86 (embedded) to use common irq_domain
        ppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c
        irq_domain/microblaze: Convert microblaze to use irq_domains
        irq_domain/powerpc: Replace custom xlate functions with library functions
        irq_domain/powerpc: constify irq_domain_ops
        irq_domain/c6x: Use library of xlate functions
        irq_domain/c6x: constify irq_domain structures
        irq_domain/c6x: Convert c6x to use generic irq_domain support.
        irq_domain: constify irq_domain_ops
        irq_domain: Create common xlate functions that device drivers can use
        irq_domain: Remove irq_domain_add_simple()
        irq_domain: Remove 'new' irq_domain in favour of the ppc one
        mfd: twl-core.c: Fix the number of interrupts managed by twl4030
        of/address: add empty static inlines for !CONFIG_OF
        irq_domain: Add support for base irq and hwirq in legacy mappings
        ...
      c207f3a4
    • Linus Torvalds's avatar
      Merge tag 'pm-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c7c66c0c
      Linus Torvalds authored
      Pull power management updates for 3.4 from Rafael Wysocki:
       "Assorted extensions and fixes including:
      
        * Introduction of early/late suspend/hibernation device callbacks.
        * Generic PM domains extensions and fixes.
        * devfreq updates from Axel Lin and MyungJoo Ham.
        * Device PM QoS updates.
        * Fixes of concurrency problems with wakeup sources.
        * System suspend and hibernation fixes."
      
      * tag 'pm-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (43 commits)
        PM / Domains: Check domain status during hibernation restore of devices
        PM / devfreq: add relation of recommended frequency.
        PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on()
        PM / shmobile: Make CMT driver use pm_genpd_dev_always_on()
        PM / shmobile: Make TMU driver use pm_genpd_dev_always_on()
        PM / Domains: Introduce "always on" device flag
        PM / Domains: Fix hibernation restore of devices, v2
        PM / Domains: Fix handling of wakeup devices during system resume
        sh_mmcif / PM: Use PM QoS latency constraint
        tmio_mmc / PM: Use PM QoS latency constraint
        PM / QoS: Make it possible to expose PM QoS latency constraints
        PM / Sleep: JBD and JBD2 missing set_freezable()
        PM / Domains: Fix include for PM_GENERIC_DOMAINS=n case
        PM / Freezer: Remove references to TIF_FREEZE in comments
        PM / Sleep: Add more wakeup source initialization routines
        PM / Hibernate: Enable usermodehelpers in hibernate() error path
        PM / Sleep: Make __pm_stay_awake() delete wakeup source timers
        PM / Sleep: Fix race conditions related to wakeup source timer function
        PM / Sleep: Fix possible infinite loop during wakeup source destruction
        PM / Hibernate: print physical addresses consistently with other parts of kernel
        ...
      c7c66c0c
    • Linus Torvalds's avatar
      Merge branch 'kmap_atomic' of git://github.com/congwang/linux · 9f393834
      Linus Torvalds authored
      Pull kmap_atomic cleanup from Cong Wang.
      
      It's been in -next for a long time, and it gets rid of the (no longer
      used) second argument to k[un]map_atomic().
      
      Fix up a few trivial conflicts in various drivers, and do an "evil
      merge" to catch some new uses that have come in since Cong's tree.
      
      * 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
        feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
        highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
        drbd: remove the second argument of k[un]map_atomic()
        zcache: remove the second argument of k[un]map_atomic()
        gma500: remove the second argument of k[un]map_atomic()
        dm: remove the second argument of k[un]map_atomic()
        tomoyo: remove the second argument of k[un]map_atomic()
        sunrpc: remove the second argument of k[un]map_atomic()
        rds: remove the second argument of k[un]map_atomic()
        net: remove the second argument of k[un]map_atomic()
        mm: remove the second argument of k[un]map_atomic()
        lib: remove the second argument of k[un]map_atomic()
        power: remove the second argument of k[un]map_atomic()
        kdb: remove the second argument of k[un]map_atomic()
        udf: remove the second argument of k[un]map_atomic()
        ubifs: remove the second argument of k[un]map_atomic()
        squashfs: remove the second argument of k[un]map_atomic()
        reiserfs: remove the second argument of k[un]map_atomic()
        ocfs2: remove the second argument of k[un]map_atomic()
        ntfs: remove the second argument of k[un]map_atomic()
        ...
      9f393834
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 69a7aebc
      Linus Torvalds authored
      Pull trivial tree from Jiri Kosina:
       "It's indeed trivial -- mostly documentation updates and a bunch of
        typo fixes from Masanari.
      
        There are also several linux/version.h include removals from Jesper."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
        kcore: fix spelling in read_kcore() comment
        constify struct pci_dev * in obvious cases
        Revert "char: Fix typo in viotape.c"
        init: fix wording error in mm_init comment
        usb: gadget: Kconfig: fix typo for 'different'
        Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
        writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
        writeback: fix typo in the writeback_control comment
        Documentation: Fix multiple typo in Documentation
        tpm_tis: fix tis_lock with respect to RCU
        Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
        Doc: Update numastat.txt
        qla4xxx: Add missing spaces to error messages
        compiler.h: Fix typo
        security: struct security_operations kerneldoc fix
        Documentation: broken URL in libata.tmpl
        Documentation: broken URL in filesystems.tmpl
        mtd: simplify return logic in do_map_probe()
        mm: fix comment typo of truncate_inode_pages_range
        power: bq27x00: Fix typos in comment
        ...
      69a7aebc
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · d464c92b
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "It contains HID driver updates all over the place -- a lot of new
        hardware support especially in the multitouch area, including generic
        handling of all multitouch devices by the hid-multitiouch driver
        automatically."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (42 commits)
        HID: multitouch: add PID for Fructel product
        HID: wacom: Add reporting of wheel for Intuos4 WL
        HID: wacom: Replace __set_bit with input_set_capability
        HID: tivo: add support for BT-version (0x1200)
        HID: wacom: Reset stylus buttons - Intuos4 WL
        HID: multitouch: detect serial protocol
        HID: handle all multitouch devices through hid-multitouch
        HID: multitouch: fix handling of buggy reports descriptors for Dell ST2220T
        HID: make it possible to force hid-core claim the device
        HID: multitouch: add support for eGalax 0x722a
        HID: usbhid: add quirk no_get for quanta 3008 devices
        HID: multitouch: add more eGalax devices
        HID: multitouch: add new PID from Ideacom
        HID: multitouch: add support for Atmel maXTouch 03eb:2118
        HID: waltop: Add support for tablet with PID 0038
        HID: waltop: Replace original rdescs with links
        HID: uclogic: Replace original rdescs with links
        HID: wacom: Add pad buttons reporting on Intuos4 WL
        HID: wacom: report distance for Intuos4 WL
        HID: kye: Add support for 3 tablets
        ...
      d464c92b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 3b59bf08
      Linus Torvalds authored
      Pull networking merge from David Miller:
       "1) Move ixgbe driver over to purely page based buffering on receive.
           From Alexander Duyck.
      
        2) Add receive packet steering support to e1000e, from Bruce Allan.
      
        3) Convert TCP MD5 support over to RCU, from Eric Dumazet.
      
        4) Reduce cpu usage in handling out-of-order TCP packets on modern
           systems, also from Eric Dumazet.
      
        5) Support the IP{,V6}_UNICAST_IF socket options, making the wine
           folks happy, from Erich Hoover.
      
        6) Support VLAN trunking from guests in hyperv driver, from Haiyang
           Zhang.
      
        7) Support byte-queue-limtis in r8169, from Igor Maravic.
      
        8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but
           was never properly implemented, Jiri Benc fixed that.
      
        9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.
      
        10) Support kernel side dump filtering by ctmark in netfilter
            ctnetlink, from Pablo Neira Ayuso.
      
        11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.
      
        12) Add new peek socket options to assist with socket migration, from
            Pavel Emelyanov.
      
        13) Add sch_plug packet scheduler whose queue is controlled by
            userland daemons using explicit freeze and release commands.  From
            Shriram Rajagopalan.
      
        14) Fix FCOE checksum offload handling on transmit, from Yi Zou."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)
        Fix pppol2tp getsockname()
        Remove printk from rds_sendmsg
        ipv6: fix incorrent ipv6 ipsec packet fragment
        cpsw: Hook up default ndo_change_mtu.
        net: qmi_wwan: fix build error due to cdc-wdm dependecy
        netdev: driver: ethernet: Add TI CPSW driver
        netdev: driver: ethernet: add cpsw address lookup engine support
        phy: add am79c874 PHY support
        mlx4_core: fix race on comm channel
        bonding: send igmp report for its master
        fs_enet: Add MPC5125 FEC support and PHY interface selection
        net: bpf_jit: fix BPF_S_LDX_B_MSH compilation
        net: update the usage of CHECKSUM_UNNECESSARY
        fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx
        net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso
        ixgbe: Fix issues with SR-IOV loopback when flow control is disabled
        net/hyperv: Fix the code handling tx busy
        ixgbe: fix namespace issues when FCoE/DCB is not enabled
        rtlwifi: Remove unused ETH_ADDR_LEN defines
        igbvf: Use ETH_ALEN
        ...
      
      Fix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and
      drivers/net/usb/{Kconfig,qmi_wwan.c} as per David.
      3b59bf08
    • Linus Torvalds's avatar
      Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · e45836fa
      Linus Torvalds authored
      Pull workqueue changes from Tejun Heo:
       "This contains only one commit which cleans up UP allocation path a
        bit."
      
      * 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: use percpu allocator for cwq on UP
      e45836fa
    • Linus Torvalds's avatar
      Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 0d9cabdc
      Linus Torvalds authored
      Pull cgroup changes from Tejun Heo:
       "Out of the 8 commits, one fixes a long-standing locking issue around
        tasklist walking and others are cleanups."
      
      * 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list
        cgroup: Remove wrong comment on cgroup_enable_task_cg_list()
        cgroup: remove cgroup_subsys argument from callbacks
        cgroup: remove extra calls to find_existing_css_set
        cgroup: replace tasklist_lock with rcu_read_lock
        cgroup: simplify double-check locking in cgroup_attach_proc
        cgroup: move struct cgroup_pidlist out from the header file
        cgroup: remove cgroup_attach_task_current_cg()
      0d9cabdc
  2. 20 Mar, 2012 31 commits
    • Oleg Nesterov's avatar
      exec: move de_thread()->setmax_mm_hiwater_rss() into exec_mmap() · 701085b2
      Oleg Nesterov authored
      Minor cleanup. de_thread()->setmax_mm_hiwater_rss() looks a bit
      strange, move it into exec_mmap() which plays with old_mm.
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      701085b2
    • Oleg Nesterov's avatar
      exit_signal: fix the "parent has changed security domain" logic · b6e238dc
      Oleg Nesterov authored
      exit_notify() changes ->exit_signal if the parent already did exec.
      This doesn't really work, we are not going to send the signal now
      if there is another live thread or the exiting task is traced. The
      parent can exec before the last dies or the tracer detaches.
      
      Move this check into do_notify_parent() which actually sends the
      signal.
      
      The user-visible change is that we do not change ->exit_signal,
      and thus the exiting task is still "clone children" for
      do_wait()->eligible_child(__WCLONE). Hopefully this is fine, the
      current logic is racy anyway.
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b6e238dc
    • Oleg Nesterov's avatar
      exit_signal: simplify the "we have changed execution domain" logic · e6368253
      Oleg Nesterov authored
      exit_notify() checks "tsk->self_exec_id != tsk->parent_exec_id"
      to handle the "we have changed execution domain" case.
      
      We can change do_thread() to always set ->exit_signal = SIGCHLD
      and remove this check to simplify the code.
      
      We could change setup_new_exec() instead, this looks more logical
      because it increments ->self_exec_id. But note that de_thread()
      already resets ->exit_signal if it changes the leader, let's keep
      both changes close to each other.
      
      Note that we change ->exit_signal lockless, this changes the rules.
      Thereafter ->exit_signal is not stable under tasklist but this is
      fine, the only possible change is OLDSIG -> SIGCHLD. This can race
      with eligible_child() but the race is harmless. We can race with
      reparent_leader() which changes our ->exit_signal in parallel, but
      it does the same change to SIGCHLD.
      
      The noticeable user-visible change is that the execing task is not
      "visible" to do_wait()->eligible_child(__WCLONE) right after exec.
      To me this looks more logical, and this is consistent with mt case.
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e6368253
    • Oleg Nesterov's avatar
      CLONE_PARENT shouldn't allow to set ->exit_signal · 5f8aadd8
      Oleg Nesterov authored
      The child must not control its ->exit_signal, it is the parent who
      decides which signal the child should use for notification.
      
      This means that CLONE_PARENT should not use "clone_flags & CSIGNAL",
      the forking task is the sibling of the new process and their parent
      doesn't control exit_signal in this case.
      
      This patch uses ->exit_signal of the forking process, but perhaps
      we should simply use SIGCHLD.
      
      We read group_leader->exit_signal lockless, this can race with the
      ORIGINAL_SIGNAL -> SIGCHLD transition, but this is fine.
      
      Potentially this change allows to kill self_exec_id/parent_exec_id.
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5f8aadd8
    • Benjamin LaHaise's avatar
      Fix pppol2tp getsockname() · bbdb32cb
      Benjamin LaHaise authored
      While testing L2TP functionality, I came across a bug in getsockname().  The
      IP address returned within the pppol2tp_addr's addr memember was not being
      set to the IP  address in use.  This bug is caused by using inet_sk() on the
      wrong socket (the L2TP socket rather than the underlying UDP socket), and was
      likely introduced during the addition of L2TPv3 support.
      Signed-off-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
      Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bbdb32cb
    • Dave Jones's avatar
      Remove printk from rds_sendmsg · a6506e14
      Dave Jones authored
      no socket layer outputs a message for this error and neither should rds.
      Signed-off-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a6506e14
    • Linus Torvalds's avatar
      Merge tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · ed378a52
      Linus Torvalds authored
      Pull USB merge for 3.4-rc1 from Greg KH:
       "Here's the big USB merge for the 3.4-rc1 merge window.
      
        Lots of gadget driver reworks here, driver updates, xhci changes, some
        new drivers added, usb-serial core reworking to fix some bugs, and
        other various minor things.
      
        There are some patches touching arch code, but they have all been
        acked by the various arch maintainers."
      
      * tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (302 commits)
        net: qmi_wwan: add support for ZTE MF820D
        USB: option: add ZTE MF820D
        usb: gadget: f_fs: Remove lock is held before freeing checks
        USB: option: make interface blacklist work again
        usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver
        USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls
        USB: use generic platform driver on ath79
        USB: EHCI: Add a generic platform device driver
        USB: OHCI: Add a generic platform device driver
        USB: ftdi_sio: new PID: LUMEL PD12
        USB: ftdi_sio: add support for FT-X series devices
        USB: serial: mos7840: Fixed MCS7820 device attach problem
        usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.
        usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
        USB: ohci-nxp: Remove i2c_write(), use smbus
        USB: ohci-nxp: Support for LPC32xx
        USB: ohci-nxp: Rename symbols from pnx4008 to nxp
        USB: OHCI-HCD: Rename ohci-pnx4008 to ohci-nxp
        usb: gadget: Kconfig: fix typo for 'different'
        usb: dwc3: pci: fix another failure path in dwc3_pci_probe()
        ...
      ed378a52
    • Linus Torvalds's avatar
      Merge tag 'tty-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 843ec558
      Linus Torvalds authored
      Pull TTY/serial patches from Greg KH:
       "tty and serial merge for 3.4-rc1
      
        Here's the big serial and tty merge for the 3.4-rc1 tree.
      
        There's loads of fixes and reworks in here from Jiri for the tty
        layer, and a number of patches from Alan to help try to wrestle the vt
        layer into a sane model.
      
        Other than that, lots of driver updates and fixes, and other minor
        stuff, all detailed in the shortlog."
      
      * tag 'tty-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (132 commits)
        serial: pxa: add clk_prepare/clk_unprepare calls
        TTY: Wrong unicode value copied in con_set_unimap()
        serial: PL011: clear pending interrupts
        serial: bfin-uart: Don't access tty circular buffer in TX DMA interrupt after it is reset.
        vt: NULL dereference in vt_do_kdsk_ioctl()
        tty: serial: vt8500: fix annotations for probe/remove
        serial: remove back and forth conversions in serial_out_sync
        serial: use serial_port_in/out vs serial_in/out in 8250
        serial: introduce generic port in/out helpers
        serial: reduce number of indirections in 8250 code
        serial: delete useless void casts in 8250.c
        serial: make 8250's serial_in shareable to other drivers.
        serial: delete last unused traces of pausing I/O in 8250
        pch_uart: Add module parameter descriptions
        pch_uart: Use existing default_baud in setup_console
        pch_uart: Add user_uartclk parameter
        pch_uart: Add Fish River Island II uart clock quirks
        pch_uart: Use uartclk instead of base_baud
        mpc5200b/uart: select more tolerant uart prescaler on low baudrates
        tty: moxa: fix bit test in moxa_start()
        ...
      843ec558
    • Linus Torvalds's avatar
      Merge tag 'staging-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 71e7ff25
      Linus Torvalds authored
      Pull big staging driver updates from Greg KH:
       "Here is the big drivers/staging/ merge for 3.4-rc1
      
        Lots of new driver updates here, with the addition of a few new ones,
        and only one moving out of the staging tree to the "real" part of the
        kernel (the hyperv scsi driver, acked by the scsi maintainer).
      
        There are also loads of cleanups, fixes, and other minor things in
        here, all self-contained in the drivers/staging/ tree.
      
        Overall we reversed the recent trend by adding more lines than we
        removed:
         379 files changed, 37952 insertions(+), 14153 deletions(-)"
      
      * tag 'staging-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (360 commits)
        staging/zmem: Use lockdep_assert_held instead of spin_is_locked
        Staging: rtl8187se: r8180_wx.c: Cleaned up comments
        Staging: rtl8187se: r8180_wx.c: Removed old comments
        Staging: rtl8187se: r8180_dm.c: Removed old comments
        Staging: android: ram_console.c:
        Staging: rtl8187se: r8180_dm.c: Fix comments
        Staging: rtl8187se: r8180_dm.c: Fix spacing issues
        Staging: rtl8187se: r8180_dm.c Fixed indentation issues
        Staging: rtl8187se: r8180_dm.c: Fix brackets
        Staging: rtl8187se: r8180_dm.c: Removed spaces before tab stop
        staging: vme: fix section mismatches in linux-next 20120314
        Staging: rtl8187se: r8180_core.c: Fix some long line issues
        Staging: rtl8187se: r8180_core.c: Fix some spacing issues
        Staging: rtl8187se: r8180_core.c: Removed trailing spaces
        staging: mei: remove driver internal versioning
        Staging: rtl8187se: r8180_core.c: Cleaned up if statement
        staging: ozwpan depends on NET
        staging: ozwpan: added maintainer for ozwpan driver
        staging/mei: propagate error codes up in the write flow
        drivers:staging:mei Fix some typos in staging/mei
        ...
      71e7ff25
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 4a522463
      Linus Torvalds authored
      Pull driver core patches for 3.4-rc1 from Greg KH:
       "Here's the big driver core merge for 3.4-rc1.
      
        Lots of various things here, sysfs fixes/tweaks (with the nlink
        breakage reverted), dynamic debugging updates, w1 drivers, hyperv
        driver updates, and a variety of other bits and pieces, full
        information in the shortlog."
      
      * tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (78 commits)
        Tools: hv: Support enumeration from all the pools
        Tools: hv: Fully support the new KVP verbs in the user level daemon
        Drivers: hv: Support the newly introduced KVP messages in the driver
        Drivers: hv: Add new message types to enhance KVP
        regulator: Support driver probe deferral
        Revert "sysfs: Kill nlink counting."
        uevent: send events in correct order according to seqnum (v3)
        driver core: minor comment formatting cleanups
        driver core: move the deferred probe pointer into the private area
        drivercore: Add driver probe deferral mechanism
        DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers
        w1_bq27000: Only one thread can access the bq27000 at a time.
        w1_bq27000 - remove w1_bq27000_write
        w1_bq27000: remove unnecessary NULL test.
        sysfs: Fix memory leak in sysfs_sd_setsecdata().
        intel_idle: Revert change of auto_demotion_disable_flags for Nehalem
        w1: Fix w1_bq27000
        driver-core: documentation: fix up Greg's email address
        powernow-k6: Really enable auto-loading
        powernow-k7: Fix CPU family number
        ...
      4a522463
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 9f9d2760
      Linus Torvalds authored
      Pull char and misc patches for 3.4-rc1 from Greg KH:
       "Not much here, just a few minor fixes and some conversions to the
        module_*_driver() functions, making the codebase smaller."
      
      * tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        misc: bmp085: Use unsigned long to store jiffies
        char/ramoops: included linux/err.h twice
        misc: bmp085: Handle jiffies overflow correctly
        misc: fsa9480: Remove obsolete cleanup for clientdata
        char: Fix typo in tlclk.c
        char: Fix typo in viotape.c
        cs5535-mfgpt: don't call __init function from __devinit
        MISC: convert drivers/misc/* to use module_spi_driver()
        MISC: convert drivers/misc/* to use module_i2c_driver()
        MISC: convert drivers/misc/* to use module_platform_driver()
      9f9d2760
    • Dan Carpenter's avatar
      AFS: checking wrong bit in afs_readpages() · ad2a8e60
      Dan Carpenter authored
      We should be testing "if (vnode->flags & (1 << 4))" instead of
      "if (vnode->flags & 4) {".  The current test checks if the data was
      modified instead of deleted.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ad2a8e60
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 161f7a71
      Linus Torvalds authored
      Pull timer changes for v3.4 from Ingo Molnar
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
        ntp: Fix integer overflow when setting time
        math: Introduce div64_long
        cs5535-clockevt: Allow the MFGPT IRQ to be shared
        cs5535-clockevt: Don't ignore MFGPT on SMP-capable kernels
        x86/time: Eliminate unused irq0_irqs counter
        clocksource: scx200_hrt: Fix the build
        x86/tsc: Reduce the TSC sync check time for core-siblings
        timer: Fix bad idle check on irq entry
        nohz: Remove ts->Einidle checks before restarting the tick
        nohz: Remove update_ts_time_stat from tick_nohz_start_idle
        clockevents: Leave the broadcast device in shutdown mode when not needed
        clocksource: Load the ACPI PM clocksource asynchronously
        clocksource: scx200_hrt: Convert scx200 to use clocksource_register_hz
        clocksource: Get rid of clocksource_calc_mult_shift()
        clocksource: dbx500: convert to clocksource_register_hz()
        clocksource: scx200_hrt:  use pr_<level> instead of printk
        time: Move common updates to a function
        time: Reorder so the hot data is together
        time: Remove most of xtime_lock usage in timekeeping.c
        ntp: Add ntp_lock to replace xtime_locking
        ...
      161f7a71
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2ba68940
      Linus Torvalds authored
      Pull scheduler changes for v3.4 from Ingo Molnar
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
        printk: Make it compile with !CONFIG_PRINTK
        sched/x86: Fix overflow in cyc2ns_offset
        sched: Fix nohz load accounting -- again!
        sched: Update yield() docs
        printk/sched: Introduce special printk_sched() for those awkward moments
        sched/nohz: Correctly initialize 'next_balance' in 'nohz' idle balancer
        sched: Cleanup cpu_active madness
        sched: Fix load-balance wreckage
        sched: Clean up parameter passing of proc_sched_autogroup_set_nice()
        sched: Ditch per cgroup task lists for load-balancing
        sched: Rename load-balancing fields
        sched: Move load-balancing arguments into helper struct
        sched/rt: Do not submit new work when PI-blocked
        sched/rt: Prevent idle task boosting
        sched/wait: Add __wake_up_all_locked() API
        sched/rt: Document scheduler related skip-resched-check sites
        sched/rt: Use schedule_preempt_disabled()
        sched/rt: Add schedule_preempt_disabled()
        sched/rt: Do not throttle when PI boosting
        sched/rt: Keep period timer ticking when rt throttling is active
        ...
      2ba68940
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9c2b957d
      Linus Torvalds authored
      Pull perf events changes for v3.4 from Ingo Molnar:
      
       - New "hardware based branch profiling" feature both on the kernel and
         the tooling side, on CPUs that support it.  (modern x86 Intel CPUs
         with the 'LBR' hardware feature currently.)
      
         This new feature is basically a sophisticated 'magnifying glass' for
         branch execution - something that is pretty difficult to extract from
         regular, function histogram centric profiles.
      
         The simplest mode is activated via 'perf record -b', and the result
         looks like this in perf report:
      
      	$ perf record -b any_call,u -e cycles:u branchy
      
      	$ perf report -b --sort=symbol
      	    52.34%  [.] main                   [.] f1
      	    24.04%  [.] f1                     [.] f3
      	    23.60%  [.] f1                     [.] f2
      	     0.01%  [k] _IO_new_file_xsputn    [k] _IO_file_overflow
      	     0.01%  [k] _IO_vfprintf_internal  [k] _IO_new_file_xsputn
      	     0.01%  [k] _IO_vfprintf_internal  [k] strchrnul
      	     0.01%  [k] __printf               [k] _IO_vfprintf_internal
      	     0.01%  [k] main                   [k] __printf
      
         This output shows from/to branch columns and shows the highest
         percentage (from,to) jump combinations - i.e.  the most likely taken
         branches in the system.  "branches" can also include function calls
         and any other synchronous and asynchronous transitions of the
         instruction pointer that are not 'next instruction' - such as system
         calls, traps, interrupts, etc.
      
         This feature comes with (hopefully intuitive) flat ascii and TUI
         support in perf report.
      
       - Various 'perf annotate' visual improvements for us assembly junkies.
         It will now recognize function calls in the TUI and by hitting enter
         you can follow the call (recursively) and back, amongst other
         improvements.
      
       - Multiple threads/processes recording support in perf record, perf
         stat, perf top - which is activated via a comma-list of PIDs:
      
      	perf top -p 21483,21485
      	perf stat -p 21483,21485 -ddd
      	perf record -p 21483,21485
      
       - Support for per UID views, via the --uid paramter to perf top, perf
         report, etc.  For example 'perf top --uid mingo' will only show the
         tasks that I am running, excluding other users, root, etc.
      
       - Jump label restructurings and improvements - this includes the
         factoring out of the (hopefully much clearer) include/linux/static_key.h
         generic facility:
      
      	struct static_key key = STATIC_KEY_INIT_FALSE;
      
      	...
      
      	if (static_key_false(&key))
      	        do unlikely code
      	else
      	        do likely code
      
      	...
      	static_key_slow_inc();
      	...
      	static_key_slow_inc();
      	...
      
         The static_key_false() branch will be generated into the code with as
         little impact to the likely code path as possible.  the
         static_key_slow_*() APIs flip the branch via live kernel code patching.
      
         This facility can now be used more widely within the kernel to
         micro-optimize hot branches whose likelihood matches the static-key
         usage and fast/slow cost patterns.
      
       - SW function tracer improvements: perf support and filtering support.
      
       - Various hardenings of the perf.data ABI, to make older perf.data's
         smoother on newer tool versions, to make new features integrate more
         smoothly, to support cross-endian recording/analyzing workflows
         better, etc.
      
       - Restructuring of the kprobes code, the splitting out of 'optprobes',
         and a corner case bugfix.
      
       - Allow the tracing of kernel console output (printk).
      
       - Improvements/fixes to user-space RDPMC support, allowing user-space
         self-profiling code to extract PMU counts without performing any
         system calls, while playing nice with the kernel side.
      
       - 'perf bench' improvements
      
       - ... and lots of internal restructurings, cleanups and fixes that made
         these features possible.  And, as usual this list is incomplete as
         there were also lots of other improvements
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (120 commits)
        perf report: Fix annotate double quit issue in branch view mode
        perf report: Remove duplicate annotate choice in branch view mode
        perf/x86: Prettify pmu config literals
        perf report: Enable TUI in branch view mode
        perf report: Auto-detect branch stack sampling mode
        perf record: Add HEADER_BRANCH_STACK tag
        perf record: Provide default branch stack sampling mode option
        perf tools: Make perf able to read files from older ABIs
        perf tools: Fix ABI compatibility bug in print_event_desc()
        perf tools: Enable reading of perf.data files from different ABI rev
        perf: Add ABI reference sizes
        perf report: Add support for taken branch sampling
        perf record: Add support for sampling taken branch
        perf tools: Add code to support PERF_SAMPLE_BRANCH_STACK
        x86/kprobes: Split out optprobe related code to kprobes-opt.c
        x86/kprobes: Fix a bug which can modify kernel code permanently
        x86/kprobes: Fix instruction recovery on optimized path
        perf: Add callback to flush branch_stack on context switch
        perf: Disable PERF_SAMPLE_BRANCH_* when not supported
        perf/x86: Add LBR software filter support for Intel CPUs
        ...
      9c2b957d
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0bbfcaff
      Linus Torvalds authored
      Pull irq/core changes for v3.4 from Ingo Molnar
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq: Remove paranoid warnons and bogus fixups
        genirq: Flush the irq thread on synchronization
        genirq: Get rid of unnecessary IRQTF_DIED flag
        genirq: No need to check IRQTF_DIED before stopping a thread handler
        genirq: Get rid of unnecessary irqaction field in task_struct
        genirq: Fix incorrect check for forced IRQ thread handler
        softirq: Reduce invoke_softirq() code duplication
        genirq: Fix long-term regression in genirq irq_set_irq_type() handling
        x86-32/irq: Don't switch to irq stack for a user-mode irq
      0bbfcaff
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5928a2b6
      Linus Torvalds authored
      Pull RCU changes for v3.4 from Ingo Molnar.  The major features of this
      series are:
      
       - making RCU more aggressive about entering dyntick-idle mode in order
         to improve energy efficiency
      
       - converting a few more call_rcu()s to kfree_rcu()s
      
       - applying a number of rcutree fixes and cleanups to rcutiny
      
       - removing CONFIG_SMP #ifdefs from treercu
      
       - allowing RCU CPU stall times to be set via sysfs
      
       - adding CPU-stall capability to rcutorture
      
       - adding more RCU-abuse diagnostics
      
       - updating documentation
      
       - fixing yet more issues located by the still-ongoing top-to-bottom
         inspection of RCU, this time with a special focus on the CPU-hotplug
         code path.
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (48 commits)
        rcu: Stop spurious warnings from synchronize_sched_expedited
        rcu: Hold off RCU_FAST_NO_HZ after timer posted
        rcu: Eliminate softirq-mediated RCU_FAST_NO_HZ idle-entry loop
        rcu: Add RCU_NONIDLE() for idle-loop RCU read-side critical sections
        rcu: Allow nesting of rcu_idle_enter() and rcu_idle_exit()
        rcu: Remove redundant check for rcu_head misalignment
        PTR_ERR should be called before its argument is cleared.
        rcu: Convert WARN_ON_ONCE() in rcu_lock_acquire() to lockdep
        rcu: Trace only after NULL-pointer check
        rcu: Call out dangers of expedited RCU primitives
        rcu: Rework detection of use of RCU by offline CPUs
        lockdep: Add CPU-idle/offline warning to lockdep-RCU splat
        rcu: No interrupt disabling for rcu_prepare_for_idle()
        rcu: Move synchronize_sched_expedited() to rcutree.c
        rcu: Check for illegal use of RCU from offlined CPUs
        rcu: Update stall-warning documentation
        rcu: Add CPU-stall capability to rcutorture
        rcu: Make documentation give more realistic rcutorture duration
        rcutorture: Permit holding off CPU-hotplug operations during boot
        rcu: Print scheduling-clock information on RCU CPU stall-warning messages
        ...
      5928a2b6
    • Cong Wang's avatar
    • Cong Wang's avatar
      highmem: kill all __kmap_atomic() · a24401bc
      Cong Wang authored
      [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      a24401bc
    • Cong Wang's avatar
      589973a7
    • Cong Wang's avatar
    • Cong Wang's avatar
      f0c5b592
    • Cong Wang's avatar
      c2e022cb
    • Cong Wang's avatar
    • Cong Wang's avatar
      b8541786
    • Cong Wang's avatar
    • Cong Wang's avatar
    • Cong Wang's avatar
      9b04c5fe
    • Cong Wang's avatar
      c3eede8e
    • Cong Wang's avatar
      0de9a1e2
    • Cong Wang's avatar
      d762a50b