1. 25 Feb, 2013 4 commits
  2. 24 Feb, 2013 2 commits
    • Paul Gortmaker's avatar
      gianfar: fix compile fail for NET_POLL=y due to struct packing · 62ed839d
      Paul Gortmaker authored
      Commit ee873fda ("gianfar: Pack struct
      gfar_priv_grp into three cachelines") moved the irq number and names
      off into a separate struct and created accessors for them.  However
      it was never tested with NET_POLL enabled, and so some conversions
      that were simply overlooked went undetected until now.
      
      Make the netpoll ones also use the gfar_irq() accessors.
      Reported-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Claudiu Manoil <claudiu.manoil@freescale.com>
      Cc: Jianhua Xie <jianhua.xie@freescale.com>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      62ed839d
    • Cong Wang's avatar
      vlan: adjust vlan_set_encap_proto() for its callers · da8c8724
      Cong Wang authored
      There are two places to call vlan_set_encap_proto():
      vlan_untag() and __pop_vlan_tci().
      
      vlan_untag() assumes skb->data points after mac addr, otherwise
      the following code
      
              vhdr = (struct vlan_hdr *) skb->data;
              vlan_tci = ntohs(vhdr->h_vlan_TCI);
              __vlan_hwaccel_put_tag(skb, vlan_tci);
      
              skb_pull_rcsum(skb, VLAN_HLEN);
      
      won't be correct. But __pop_vlan_tci() assumes points _before_
      mac addr.
      
      In vlan_set_encap_proto(), it looks for some magic L2 value
      after mac addr:
      
              rawp = skb->data;
              if (*(unsigned short *) rawp == 0xFFFF)
      	...
      
      Therefore __pop_vlan_tci() is obviously wrong.
      
      A quick fix is avoiding using skb->data in vlan_set_encap_proto(),
      use 'vhdr+1' is always correct in both cases.
      
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Jesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Acked-by: default avatarJesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      da8c8724
  3. 23 Feb, 2013 5 commits
  4. 22 Feb, 2013 6 commits
  5. 21 Feb, 2013 7 commits
    • Eric Dumazet's avatar
      ipv6: use a stronger hash for tcp · 08dcdbf6
      Eric Dumazet authored
      It looks like its possible to open thousands of TCP IPv6
      sessions on a server, all landing in a single slot of TCP hash
      table. Incoming packets have to lookup sockets in a very
      long list.
      
      We should hash all bits from foreign IPv6 addresses, using
      a salt and hash mix, not a simple XOR.
      
      inet6_ehashfn() can also separately use the ports, instead
      of xoring them.
      Reported-by: default avatarNeal Cardwell <ncardwell@google.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Yuchung Cheng <ycheng@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      08dcdbf6
    • Jitendra Kalsaria's avatar
    • Manish Chopra's avatar
    • Shahed Shaikh's avatar
      qlcnic: Fix internal loopback test for 82xx adapter · d09529e6
      Shahed Shaikh authored
      o Use correct function to clear loopback mode.
      Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
      Signed-off-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d09529e6
    • Fabio Estevam's avatar
      net: fec: Ensure that initialization is done prior to request_irq() · 7f7d6c28
      Fabio Estevam authored
      Currently request_irq() is called prior to fec_enet_init() and fec_ptp_init(),
      which causes the following crash on a mx53qsb:
      
      Unable to handle kernel NULL pointer dereference at virtual address 00000002
      pgd = 80004000
      [00000002] *pgd=00000000
      Internal error: Oops: 5 [#1] SMP ARM
      Modules linked in:
      CPU: 0    Not tainted  (3.8.0-rc7-next-20130215+ #346)
      PC is at fec_enet_interrupt+0xd0/0x348
      LR is at fec_enet_interrupt+0xb8/0x348
      pc : [<80372b7c>]    lr : [<80372b64>]    psr: 60000193
      sp : df855c20  ip : df855c20  fp : df855c74
      r10: 00000516  r9 : 1c000000  r8 : 00000000
      r7 : 00000000  r6 : 00000000  r5 : 00000000  r4 : df9b7800
      r3 : df9b7df4  r2 : 00000000  r1 : 00000000  r0 : df9b7d34
      
      Ensure that such initialization functions are called prior to requesting the
      interrupts, so that all necessary the data structures are in place when the
      irqs occur.
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7f7d6c28
    • Li Wei's avatar
      ipv4: fix a bug in ping_err(). · b531ed61
      Li Wei authored
      We should get 'type' and 'code' from the outer ICMP header.
      Signed-off-by: default avatarLi Wei <lw@cn.fujitsu.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b531ed61
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · a0b1c429
      Linus Torvalds authored
      Pull networking update from David Miller:
      
       1) Checkpoint/restarted TCP sockets now can properly propagate the TCP
          timestamp offset.  From Andrey Vagin.
      
       2) VMWARE VM VSOCK layer, from Andy King.
      
       3) Much improved support for virtual functions and SR-IOV in bnx2x,
          from Ariel ELior.
      
       4) All protocols on ipv4 and ipv6 are now network namespace aware, and
          all the compatability checks for initial-namespace-only protocols is
          removed.  Thanks to Tom Parkin for helping deal with the last major
          holdout, L2TP.
      
       5) IPV6 support in netpoll and network namespace support in pktgen,
          from Cong Wang.
      
       6) Multiple Registration Protocol (MRP) and Multiple VLAN Registration
          Protocol (MVRP) support, from David Ward.
      
       7) Compute packet lengths more accurately in the packet scheduler, from
          Eric Dumazet.
      
       8) Use per-task page fragment allocator in skb_append_datato_frags(),
          also from Eric Dumazet.
      
       9) Add support for connection tracking labels in netfilter, from
          Florian Westphal.
      
      10) Fix default multicast group joining on ipv6, and add anti-spoofing
          checks to 6to4 and 6rd.  From Hannes Frederic Sowa.
      
      11) Make ipv4/ipv6 fragmentation memory limits more reasonable in modern
          times, rearrange inet frag datastructures for better cacheline
          locality, and move more operations outside of locking.  From Jesper
          Dangaard Brouer.
      
      12) Instead of strict master <--> slave relationships, allow arbitrary
          scenerios with "upper device lists".  From Jiri Pirko.
      
      13) Improve rate limiting accuracy in TBF and act_police, also from Jiri
          Pirko.
      
      14) Add a BPF filter netfilter match target, from Willem de Bruijn.
      
      15) Orphan and delete a bunch of pre-historic networking drivers from
          Paul Gortmaker.
      
      16) Add TSO support for GRE tunnels, from Pravin B SHelar.  Although
          this still needs some minor bug fixing before it's %100 correct in
          all cases.
      
      17) Handle unresolved IPSEC states like ARP, with a resolution packet
          queue.  From Steffen Klassert.
      
      18) Remove TCP Appropriate Byte Count support (ABC), from Stephen
          Hemminger.  This was long overdue.
      
      19) Support SO_REUSEPORT, from Tom Herbert.
      
      20) Allow locking a socket BPF filter, so that it cannot change after a
          process drops capabilities.
      
      21) Add VLAN filtering to bridge, from Vlad Yasevich.
      
      22) Bring ipv6 on-par with ipv4 and do not cache neighbour entries in
          the ipv6 routes, from YOSHIFUJI Hideaki.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1538 commits)
        ipv6: fix race condition regarding dst->expires and dst->from.
        net: fix a wrong assignment in skb_split()
        ip_gre: remove an extra dst_release()
        ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
        atl1c: restore buffer state
        net: fix a build failure when !CONFIG_PROC_FS
        net: ipv4: fix waring -Wunused-variable
        net: proc: fix build failed when procfs is not configured
        Revert "xen: netback: remove redundant xenvif_put"
        net: move procfs code to net/core/net-procfs.c
        qmi_wwan, cdc-ether: add ADU960S
        bonding: set sysfs device_type to 'bond'
        bonding: fix bond_release_all inconsistencies
        b44: use netdev_alloc_skb_ip_align()
        xen: netback: remove redundant xenvif_put
        net: fec: Do a sanity check on the gpio number
        ip_gre: propogate target device GSO capability to the tunnel device
        ip_gre: allow CSUM capable devices to handle packets
        bonding: Fix initialize after use for 3ad machine state spinlock
        bonding: Fix race condition between bond_enslave() and bond_3ad_update_lacp_rate()
        ...
      a0b1c429
  6. 20 Feb, 2013 16 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 8ec49422
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Mostly more sparc64 THP bug fixes, and a refactoring of SMP bootup on
        sparc32 from Sam Ravnborg."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc32: refactor smp boot
        sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
        sparc64: Fix tsb_grow() in atomic context.
        sparc64: Handle hugepage TSB being NULL.
        sparc64: Fix gfp_flags setting in tsb_grow().
      8ec49422
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 79a69d34
      Linus Torvalds authored
      Pull arm64 patches from Catalin Marinas:
      
       - SMP support for the PSCI booting protocol (power state coordination
         interface).
      
       - Simple earlyprintk support.
      
       - Platform devices populated by default from the DT (SoC-agnostic).
      
       - CONTEXTIDR support (used by external trace tools).
      
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: update CONTEXTIDR register to contain PID of current process
        arm64: atomics: fix grossly inconsistent asm constraints for exclusives
        arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link
        arm64: Select ARCH_WANT_FRAME_POINTERS
        arm64: Add kvm_para.h and xor.h generic headers
        arm64: SMP: enable PSCI boot method
        arm64: psci: add support for PSCI invocations from the kernel
        arm64: SMP: rework the SMP code to be enabling method agnostic
        arm64: perf: add guest vs host discrimination
        arm64: add COMPAT_PSR_*_BIT flags
        arm64: Add simple earlyprintk support
        arm64: Populate the platform devices
      79a69d34
    • Linus Torvalds's avatar
      Merge branch 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm · 6db167df
      Linus Torvalds authored
      Pull ARM updates (part two) from Russell King:
      
       - breakpoint and perf updates from Will Deacon.
      
       - hypervisor boot mode updates from Will.
      
       - support for Power State Coordination Interface via the Hypervisor
      
       - core ARM support for KVM
      
      * 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
        KVM: ARM: Add maintainer entry for KVM/ARM
        KVM: ARM: Power State Coordination Interface implementation
        KVM: ARM: Handle I/O aborts
        KVM: ARM: Handle guest faults in KVM
        KVM: ARM: VFP userspace interface
        KVM: ARM: Demux CCSIDR in the userspace API
        KVM: ARM: User space API for getting/setting co-proc registers
        KVM: ARM: Emulation framework and CP15 emulation
        KVM: ARM: World-switch implementation
        KVM: ARM: Inject IRQs and FIQs from userspace
        KVM: ARM: Memory virtualization setup
        KVM: ARM: Hypervisor initialization
        KVM: ARM: Initial skeleton to compile KVM support
        ARM: Section based HYP idmap
        ARM: Add page table and page defines needed by KVM
        ARM: perf: simplify __hw_perf_event_init err handling
        ARM: perf: remove unnecessary checks for idx < 0
        ARM: perf: handle armpmu_register failing
        ARM: perf: don't pretend to support counting of L1I writes
        ARM: perf: remove redundant NULL check on cpu_pmu
        ...
      6db167df
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 32f9aab8
      Linus Torvalds authored
      Pull ARM updates (part one) from Russell King:
      
       - MMC patches from Ulf Hansson and Pawel Moll.  These add support for
         DDR mode and the latest variant found on ARM Versatile Express, as
         well as a number of cleanups.
      
       - A fix for to improve the behaviour of ARMs sched_clock()
      
       - Changes to the ARM ioremap() code.  I'm not convinced with the
         primary arguments for this, but it's been around for a while, and
         people seem happy with it - and the "other" justification for this is
         at
      
            http://lkml.org/lkml/2012/12/6/184
      
       - Add SCHED_HRTICK to ARMs Kconfig
      
       - Making the ARM SHA/AES code Thumb-2 compatible
      
       - A collection of other small updates.
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (26 commits)
        ARM: add SCHED_HRTICK config option
        ARM: 7650/1: mm: replace direct access to mm->context.id with new macro
        ARM: 7649/1: mm: mm->context.id fix for big-endian
        ARM: 7648/1: pci: Allow passing per-controller private data
        ARM: 7647/1: pci: Keep pci_common_init() around after init
        ARM: fix warnings introduced by previous patch
        ARM: 7646/1: mm: use static_vm for managing static mapped areas
        ARM: 7645/1: ioremap: introduce an infrastructure for static mapped area
        ARM: 7644/1: vmregion: remove vmregion code entirely
        MAINTAINERS: Re-assert MMCI driver maintainer status
        MAINTAINERS: add additional file for MMCI driver
        MAINTAINERS: add maintainer entry for AMBA serial drivers
        ARM: 7637/1: memory: use SZ_ constants for defining the virtual memory layout
        ARM: 7643/1: sched: correct update_sched_clock()
        ARM: 7635/1: versatile: fix the PCI IRQ regression
        ARM: 7639/1: cache-l2x0: add missed dummy outer_resume entry
        ARM: 7630/1: mmc: mmci: Fixup and cleanup code for DMA handling
        ARM: 7632/1: spinlock: avoid exclusive accesses on unlock() path
        ARM: 7631/1: mmc: mmci: Add new VE MMCI variant
        ARM: 7623/1: mmc: mmci: Fixup clock gating when freq is 0 for ST-variants
        ...
      32f9aab8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · e177bb58
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
        swim: Add missing spinlock init
      e177bb58
    • Sam Ravnborg's avatar
      sparc32: refactor smp boot · f9fd3488
      Sam Ravnborg authored
      Introduce a common smp_callin() function to call
      from trampoline_32.S.
      Add platform specific functions to handle the
      platform details.
      
      This is in preparation for a patch that will
      unify the smp boot stuff for all architectures.
      sparc32 was significantly different to warrant
      this patch in preparation.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f9fd3488
    • David S. Miller's avatar
      sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler. · 76968ad2
      David S. Miller authored
      When we set the sun4u version of the PTE execute bit, it's:
      
      	or	REG, _PAGE_EXEC_4U, REG
      
      _PAGE_EXEC_4U is 0x1000, unfortunately the immedate field of the
      'or' instruction is a signed 13-bit value.  So the above actually
      assembles into:
      
      	or	REG, -4096, REG
      
      completely corrupting the final PTE value.
      
      Set it with a:
      
      	sethi	%hi(_PAGE_EXEC_4U), TMP
      	or	REG, TMP, REG
      
      sequence instead.
      
      This fixes "git gc" crashes on sun4u machines.
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      76968ad2
    • YOSHIFUJI Hideaki / 吉藤英明's avatar
      ipv6: fix race condition regarding dst->expires and dst->from. · ecd98837
      YOSHIFUJI Hideaki / 吉藤英明 authored
      Eric Dumazet wrote:
      | Some strange crashes happen in rt6_check_expired(), with access
      | to random addresses.
      |
      | At first glance, it looks like the RTF_EXPIRES and
      | stuff added in commit 1716a961
      | (ipv6: fix problem with expired dst cache)
      | are racy : same dst could be manipulated at the same time
      | on different cpus.
      |
      | At some point, our stack believes rt->dst.from contains a dst pointer,
      | while its really a jiffie value (as rt->dst.expires shares the same area
      | of memory)
      |
      | rt6_update_expires() should be fixed, or am I missing something ?
      |
      | CC Neil because of https://bugzilla.redhat.com/show_bug.cgi?id=892060
      
      Because we do not have any locks for dst_entry, we cannot change
      essential structure in the entry; e.g., we cannot change reference
      to other entity.
      
      To fix this issue, split 'from' and 'expires' field in dst_entry
      out of union.  Once it is 'from' is assigned in the constructor,
      keep the reference until the very last stage of the life time of
      the object.
      
      Of course, it is unsafe to change 'from', so make rt6_set_from simple
      just for fresh entries.
      Reported-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Reported-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      CC: Gao Feng <gaofeng@cn.fujitsu.com>
      Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarSteinar H. Gunderson <sesse@google.com>
      Reviewed-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ecd98837
    • Amerigo Wang's avatar
      net: fix a wrong assignment in skb_split() · 68534c68
      Amerigo Wang authored
      commit c9af6db4 (net: Fix possible wrong checksum generation)
      has a suspicous piece:
      
      	-       skb_shinfo(skb1)->gso_type = skb_shinfo(skb)->gso_type;
      	-
      	+       skb_shinfo(skb)->tx_flags = skb_shinfo(skb1)->tx_flags & SKBTX_SHARED_FRAG;
      
      skb1 is the new skb, therefore should be on the left side of the assignment.
      This patch fixes it.
      
      Cc: Pravin B Shelar <pshelar@nicira.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      68534c68
    • Linus Torvalds's avatar
      Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 55529fa5
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "Mostly AMD's side of EDAC.  It is basically a new family enablement
        stuff: AMD F16h MCE decoding enablement from Jacob Shin.  The rest is
        trivial cleanups."
      
      * tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        mpc85xx_edac: Fix typo
        EDAC, MCE, AMD: Remove unneeded exports
        EDAC, MCE, AMD: Add MCE decoding support for Family 16h
        EDAC, MCE, AMD: Make MC2 decoding per-family
        amd64_edac: Remove dead code
      55529fa5
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8793422f
      Linus Torvalds authored
      Pull ACPI and power management updates from Rafael Wysocki:
      
       - Rework of the ACPI namespace scanning code from Rafael J.  Wysocki
         with contributions from Bjorn Helgaas, Jiang Liu, Mika Westerberg,
         Toshi Kani, and Yinghai Lu.
      
       - ACPI power resources handling and ACPI device PM update from Rafael
         J Wysocki.
      
       - ACPICA update to version 20130117 from Bob Moore and Lv Zheng with
         contributions from Aaron Lu, Chao Guan, Jesper Juhl, and Tim Gardner.
      
       - Support for Intel Lynxpoint LPSS from Mika Westerberg.
      
       - cpuidle update from Len Brown including Intel Haswell support, C1
         state for intel_idle, removal of global pm_idle.
      
       - cpuidle fixes and cleanups from Daniel Lezcano.
      
       - cpufreq fixes and cleanups from Viresh Kumar and Fabio Baltieri with
         contributions from Stratos Karafotis and Rickard Andersson.
      
       - Intel P-states driver for Sandy Bridge processors from Dirk
         Brandewie.
      
       - cpufreq driver for Marvell Kirkwood SoCs from Andrew Lunn.
      
       - cpufreq fixes related to ordering issues between acpi-cpufreq and
         powernow-k8 from Borislav Petkov and Matthew Garrett.
      
       - cpufreq support for Calxeda Highbank processors from Mark Langsdorf
         and Rob Herring.
      
       - cpufreq driver for the Freescale i.MX6Q SoC and cpufreq-cpu0 update
         from Shawn Guo.
      
       - cpufreq Exynos fixes and cleanups from Jonghwan Choi, Sachin Kamat,
         and Inderpal Singh.
      
       - Support for "lightweight suspend" from Zhang Rui.
      
       - Removal of the deprecated power trace API from Paul Gortmaker.
      
       - Assorted updates from Andreas Fleig, Colin Ian King, Davidlohr Bueso,
         Joseph Salisbury, Kees Cook, Li Fei, Nishanth Menon, ShuoX Liu,
         Srinivas Pandruvada, Tejun Heo, Thomas Renninger, and Yasuaki
         Ishimatsu.
      
      * tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (267 commits)
        PM idle: remove global declaration of pm_idle
        unicore32 idle: delete stray pm_idle comment
        openrisc idle: delete pm_idle
        mn10300 idle: delete pm_idle
        microblaze idle: delete pm_idle
        m32r idle: delete pm_idle, and other dead idle code
        ia64 idle: delete pm_idle
        cris idle: delete idle and pm_idle
        ARM64 idle: delete pm_idle
        ARM idle: delete pm_idle
        blackfin idle: delete pm_idle
        sparc idle: rename pm_idle to sparc_idle
        sh idle: rename global pm_idle to static sh_idle
        x86 idle: rename global pm_idle to static x86_idle
        APM idle: register apm_cpu_idle via cpuidle
        cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
        cpufreq / intel_pstate: Change to disallow module build
        tools/power turbostat: display SMI count by default
        intel_idle: export both C1 and C1E
        ACPI / hotplug: Fix concurrency issues and memory leaks
        ...
      8793422f
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · b3cdda2b
      Linus Torvalds authored
      Pull device tree changes from Grant Likely:
       "All around device tree changes destined for v3.8.  Aside from the
        documentation updates the highlights in this branch include:
      
         - Kbuild changes for using CPP with .dts files
         - locking fix from preempt_rt patchset
         - include DT alias names in device uevent
         - Selftest bugfixes and improvements
         - New function for counting phandles stanzas in a property
         - constify argument to of_node_full_name()
         - Various bug fixes
      
        This tree did also contain a commit to use platform_device_add instead
        of open-coding the device add code, but it caused problems with amba
        devices and needed to be reverted."
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits)
        Revert "of: use platform_device_add"
        kbuild: limit dtc+cpp include path
        gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
        of: Create function for counting number of phandles in a property
        of/base: Clean up exit paths for of_parse_phandle_with_args()
        of/selftest: Use selftest() macro throughout
        of/selftest: Fix GPIOs selftest to cover the 7th case
        of: fix recursive locking in of_get_next_available_child()
        documentation/devicetree: Fix a typo in exynos-dw-mshc.txt
        OF: convert devtree lock from rw_lock to raw spinlock
        of/exynos_g2d: Add Bindings for exynos G2D driver
        kbuild: create a rule to run the pre-processor on *.dts files
        input: Extend matrix-keypad device tree binding
        devicetree: Move NS2 LEDs binding into LEDs directory
        of: use platform_device_add
        powerpc/5200: Fix size to request_mem_region() call
        documentation/devicetree: Fix typos
        of: add 'const' to of_node_full_name parameter
        of: Output devicetree alias names in uevent
        DT: add vendor prefixes for Renesas and Toshiba
        ...
      b3cdda2b
    • Linus Torvalds's avatar
      Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux · 3aad3f03
      Linus Torvalds authored
      Pull SPI changes from Grant Likely:
       "Changes to both core spi code and spi device drivers.  The driver
        changes are the usual set of bug fixes and platform enablement.
      
        Core code changes include:
      
         - More intelligent assignment of SPI bus numbers when using DT
      
         - Common mechanism for using gpios as CS lines
      
         - Pull checks for bits_per_word and transfer speed out of drivers and
           into core code
      
         - Ensure temporary DMA buffers are DMA safe"
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux: (50 commits)
        spi: Document cs_gpios and cs_gpio in kernel-doc
        spi/of: Fix initialization of cs_gpios array
        spi/pxa2xx: add support for Lynxpoint SPI controllers
        spi/pxa2xx: add support for Intel Low Power Subsystem SPI
        spi/pxa2xx: add support for SPI_LOOP
        spi/pxa2xx: add support for runtime PM
        spi/pxa2xx: add support for DMA engine
        spi/pxa2xx: break out the private DMA API usage into a separate file
        spi/ath79: add shutdown handler
        spi/mips-lantiq: set SPI_MASTER_HALF_DUPLEX flag
        spi/mips-lantiq: make use of spi_finalize_current_message
        spi/bcm63xx: work around inability to keep CS up
        spi/davinci: use request_threaded_irq() to fix deadlock
        spi/orion: Use module_platform_driver()
        spi/bcm63xx: reject transfers unable to transfer
        spi: Ensure memory used for spi_write_then_read() is DMA safe
        spi/spi-mpc512x-psc: init mode bits supported by the driver
        spi/mpc512x-psc: don't use obsolet cell-index property
        spi: Remove erroneous __init, __exit and __exit_p() references in drivers
        spi/s3c64xx: fix checkpatch warnings and error
        ...
      3aad3f03
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux · 10b6339e
      Linus Torvalds authored
      Pull clock framework update from Michael Turquette:
       "The common clock framework changes for 3.9 are almost entirely fixes.
      
        None are dire enough to be Cc'd to stable which may be interpreted to
        mean that users of the framework are reaching stability.  Lots of new
        adoption of this framework is via DeviceTree data and that comes
        through the respective architecture and platform trees instead of
        through the clk framework tree.
      
        Two new features are improved debugfs output and an improvement to how
        DT clocks are initialized by reusing a common method."
      
      * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (25 commits)
        clk: sunxi: remove stale Makefile entry
        clk: vexpress: Use common of_clk_init() function
        clk: zynq: Use common of_clk_init() function
        clk: vt8500: Use common of_clk_init() function
        clk: highbank: Use common of_clk_init() function
        clk: sunxi: Use common of_clk_init() function
        clk: add common of_clk_init() function
        clk: Deduplicate exit code in clk_set_rate
        clk: beautify Makefile
        clk-divider: fix macros
        clk: prima2: enable dt-binding clkdev mapping
        clk: mxs: Index is always positive
        clk: max77686: Avoid double free at remove time
        clk: remove exported function from __init section
        clk: vt8500: Add support for WM8750/WM8850 PLL clocks
        clk: vt8500: Fix division-by-0 when requested rate=0
        clk: vt8500: Fix device clock divisor calculations
        clk: vt8500: Fix error in PLL calculations on non-exact match.
        clk: max77686: Remove unnecessary NULL checking for container_of()
        clk: JSON debugfs clock tree summary
        ...
      10b6339e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · c6699b58
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "Two new touchpad drivers - Cypress APA I2C Trackpad and Cypress PS/2
        touchpad and a big update to ALPS driver from Kevin Cernekee that adds
        support for "Rushmore" touchpads and paves way for adding support for
        "Dolphin" touchpads.
      
        There is also a new input driver for Goldfish emulator and also
        Android keyreset driver was folded into SysRq code.
      
        A few more drivers were updated with device tree bindings and others
        got some small cleanups and fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits)
        Input: cyttsp-spi - remove duplicate MODULE_ALIAS()
        Input: tsc2005 - add MODULE_ALIAS
        Input: tegra-kbc - require CONFIG_OF, remove platform data
        Input: synaptics - initialize pointer emulation usage
        Input: MT - do not apply filtering on emulated events
        Input: bma150 - make some defines public and fix some comments
        Input: bma150 - fix checking pm_runtime_get_sync() return value
        Input: ALPS - enable trackstick on Rushmore touchpads
        Input: ALPS - add support for "Rushmore" touchpads
        Input: ALPS - make the V3 packet field decoder "pluggable"
        Input: ALPS - move pixel and bitmap info into alps_data struct
        Input: ALPS - fix command mode check
        Input: ALPS - rework detection of Pinnacle AGx touchpads
        Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults()
        Input: ALPS - use function pointers for different protocol handlers
        Input: ALPS - rework detection sequence
        Input: ALPS - introduce helper function for repeated commands
        Input: ALPS - move alps_get_model() down below hw_init code
        Input: ALPS - copy "model" info into alps_data struct
        Input: ALPS - document the alps.h data structures
        ...
      c6699b58
    • Linus Torvalds's avatar
      Merge tag 'for-v3.9' of git://git.infradead.org/battery-2.6 · 5a120391
      Linus Torvalds authored
      Pull battery updates from Anton Vorontsov:
       "Four new drivers:
      
         - goldfish_battery:
      
           This is Android Emulator battery driver.  Originally from Google,
           but Intel folks reshaped it for mainline
      
         - pm2301_charger:
      
           A new driver for ST-Ericsson 2301 Power Management chip, uses
           AB8500 battery management core
      
         - qnap-poweroff:
      
           The driver adds poweroff functionality for QNAP NAS boxes
      
         - restart-poweroff:
      
           A generic driver that implements 'power off by restarting'.  The
           actual poweroff functionality is implemented through a bootloader,
           so Linux' task is just to restart the box.  The driver is useful on
           Buffalo Linkstation LS-XHL and LS-CHLv2 boards.  Andrew Lunn worked
           on submitting the driver (as well as qnap-poweroff above).
      
        Additionally:
      
         - A lot of fixes for ab8500 drivers.  This is a part of efforts of
           syncing internal ST-Ericsson development tree with the mainline.
           Lee Jones @ Linaro worked on compilation and reshaping these
           series.
      
         - New health properties for the power supplies: "Watchdog timer
           expire" and "Safety timer expire"
      
         - As usual, a bunch of fixes/cleanups here and there"
      
      * tag 'for-v3.9' of git://git.infradead.org/battery-2.6: (81 commits)
        bq2415x_charger: Add support for offline and 100mA mode
        generic-adc-battery: Fix forever loop in gab_remove()
        goldfish_battery: Add missing GENERIC_HARDIRQS dependency
        da9030_battery: Include notifier.h
        bq27x00_battery: Fix reporting battery temperature
        power/reset: Remove newly introduced __dev* annotations
        lp8727_charger: Small cleanup in naming
        ab8500_btemp: Demote initcall sequence
        ds2782_battery: Add power_supply_changed() calls for proper uevent support
        power: Add battery driver for goldfish emulator
        u8500-charger: Delay for USB enumeration
        ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
        ab8500-charger: Do not touch VBUSOVV bits
        ab8500-fg: Use correct battery charge full design
        pm2301: LPN mode control support
        pm2301: Enable vbat low monitoring
        ab8500-bm: Flush all work queues before suspending
        ab8500-fg: Go to INIT_RECOVERY when charger removed
        ab8500-charger: Add support for autopower on AB8505 and AB9540
        abx500-chargalg: Add new sysfs interface to get current charge status
        ...
      
      Fix up fairly straightforward conflicts in the ab8500 driver.  But since
      it seems to be ARM-specific, I can't even compile-test the result..
      5a120391