1. 20 Jan, 2014 11 commits
    • Linus Torvalds's avatar
      Merge tag 'ktest-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · 9451ee2d
      Linus Torvalds authored
      Pull ktest updates from Steven Rostedt:
       "Here's some basic updates to ktest.pl.  They include:
      
         - add config to modify the signal to terminate console
         - update to documentation (missing some config options)
         - add KERNEL_VERSION variable to use for other configs
         - add '=~' to let configs eval other configs
         - add BISECT_TRIES to run multiple tests per git bisect good"
      
      * tag 'ktest-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Add BISECT_TRIES to bisect test
        ktest: Add eval '=~' command to modify variables in config file
        ktest: Add special variable ${KERNEL_VERSION}
        ktest: Add documentation of CLOSE_CONSOLE_SIGNAL
        ktest: Make the signal to terminate the console configurable
      9451ee2d
    • Linus Torvalds's avatar
      Merge tag 'localmodconfig-v3.14' of... · edde1fb8
      Linus Torvalds authored
      Merge tag 'localmodconfig-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig
      
      Pull localmodconfig update from Steven Rostedt:
       "While debugging the problem with localmodconfig and the ALSA codec
        modules all being set, I discovered a small bug in the dependency
        logic.
      
        If a config has a dependency based on its setting value,
        localmodcondig misses it.
      
        For example:
      
          config FOO
              default y if BAR || ZOO
      
        If FOO is needed for a module and is set to '=m', and so are BAR or
        ZOO, localmodconfig will not see that BAR or ZOO are also needed for
        the foo module, and will incorrectly disable them"
      
      * tag 'localmodconfig-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
        localmodconfig: Add config depends by default settings
      edde1fb8
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 561a60f0
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "Add support for Kaveri CPUs to k10temp driver.  Add support for S12x0
        to coretemp driver.
      
        Cleanup and minor fixes in several drivers.  Notable are 'Do not
        return -EAGAIN for low temperatures' to coretemp and 'Re-enable
        logical device mapping for NCT6791 during resume' to nct6775.  Both
        will be sent to -stable, but only after some time in mainline"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (k10temp) Add support for Kaveri CPUs
        hwmon: (sht15) add include guard
        hwmon: (max197) add include guard
        hwmon: (nct6775) Re-enable logical device mapping for NCT6791 during resume
        hwmon: (s3c) Trivial cleanup in hwmon-s3c.h
        hwmon: (coretemp) Do not return -EAGAIN for low temperatures
        hwmon: (da9052) Fix adc to voltage calculation
        hwmon: (coretemp) Refine TjMax detection
        hwmon: (coretemp) Add PCI device ID for CE41x0 CPUs
        hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary
        hwmon: remove DEFINE_PCI_DEVICE_TABLE macro
      561a60f0
    • Linus Torvalds's avatar
      Merge tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · db4fcb45
      Linus Torvalds authored
      Pull ia64 Xen removal from Tony Luck:
       "Nobody has been maintaining xen in ia64 for a long time.  Rip it all
        out so people do not waste time making updates to broken/dead code"
      
      * tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64/xen: Remove Xen support for ia64
      db4fcb45
    • Linus Torvalds's avatar
      Merge tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 09854dde
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       - mpc85xx PCIe error interrupt support
       - misc small enhancements/fixes all over the place.
      
      * tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC: Don't try to cancel workqueue when it's never setup
        e752x_edac: Fix pci_dev usage count
        sb_edac: Mark get_mci_for_node_id as static
        EDAC: Mark edac_create_debug_nodes as static
        amd64_edac: Remove "amd64" prefix from static functions
        amd64_edac: Simplify code around decode_bus_error
        amd64_edac: Mark amd64_decode_bus_error as static
        EDAC: Remove DEFINE_PCI_DEVICE_TABLE macro
        amd64_edac: Fix condition to verify max channels allowed for F15 M30h
        edac/85xx: Add PCIe error interrupt edac support
      09854dde
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · a1a3b3ef
      Linus Torvalds authored
      Pull Metag architecture changes from James Hogan:
       - A few cleanups and minor bug fixes.
       - Kill SMP single function call IPI.
      
      * tag 'metag-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag/smp: Make boot_secondary() static
        metag: topology: export 'cpu_core_map'
        smp, metag: kill SMP single function call interrupt
        metag: smp: don't set irq regs in do_IPI()
        metag: dma: remove dead code in dma_alloc_init()
      a1a3b3ef
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 8cf7a16e
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
       - Zorro bus cleanups and UAPI revival
       - Bootinfo cleanups and UAPI revival
       - Kexec support
       - Memory size reductions and bug fixes for multi-platform kernels
       - Polled interrupt support for Atari EtherNAT, EtherNEC and NetUSBee
       - Machine-specific random_get_entropy()
       - Defconfig updates and cleanups
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (46 commits)
        m68k/mac: Make SCC reset work more reliably
        m68k/irq - Use polled IRQ flag for MFP timer cascaded interrupts
        m68k: Update defconfigs for v3.13-rc1
        m68k/defconfig: Enable EARLY_PRINTK
        m68k/mm: kmap spelling/grammar fixes
        m68k: Convert arch/m68k/kernel/traps.c to pr_*()
        m68k: Convert arch/m68k/mm/fault.c to pr_*()
        m68k/mm: Check for mm != NULL in do_page_fault() debug code
        m68k/defconfig: Disable /sbin/hotplug fork-bomb by default
        m68k/atari: Hide RTC_PORT() macro from rtc-cmos
        m68k/amiga,atari: Fix specifying multiple debug= parameters
        m68k/defconfig: Use ext4 for ext2/ext3 file systems
        m68k: Add support to export bootinfo in procfs
        m68k: Add kexec support
        m68k/mac: Mark Mac IIsi ADB driver BROKEN
        m68k/amiga: Provide mach_random_get_entropy()
        m68k: Add infrastructure for machine-specific random_get_entropy()
        m68k/atari: Call paging_init() before nf_init()
        m68k: Remove superfluous inclusions of <asm/bootinfo.h>
        m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>
        ...
      8cf7a16e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · f479c01c
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The bulk of the s390 updates for v3.14.
      
        New features are the perf support for the CPU-Measurement Sample
        Facility and the EP11 support for the crypto cards.  And the normal
        cleanups and bug-fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (44 commits)
        s390/cpum_sf: fix printk format warnings
        s390: Fix misspellings using 'codespell' tool
        s390/qdio: bridgeport support - CHSC part
        s390: delete new instances of __cpuinit usage
        s390/compat: fix PSW32_USER_BITS definition
        s390/zcrypt: add support for EP11 coprocessor cards
        s390/mm: optimize randomize_et_dyn for !PF_RANDOMIZE
        s390: use IS_ENABLED to check if a CONFIG is set to y or m
        s390/cio: use device_lock to synchronize calls to the ccwgroup driver
        s390/cio: use device_lock to synchronize calls to the ccw driver
        s390/cio: fix unlocked access of online member
        s390/cpum_sf: Add flag to process full SDBs only
        s390/cpum_sf: Add raw data sampling to support the diagnostic-sampling function
        s390/cpum_sf: Filter perf events based event->attr.exclude_* settings
        s390/cpum_sf: Detect KVM guest samples
        s390/cpum_sf: Add helper to read TOD from trailer entries
        s390/cpum_sf: Atomically reset trailer entry fields of sample-data-blocks
        s390/cpum_sf: Dynamically extend the sampling buffer if overflows occur
        s390/pci: reenable per default
        s390/pci/dma: fix accounting of allocated_pages
        ...
      f479c01c
    • Linus Torvalds's avatar
      Linux 3.13 · d8ec26d7
      Linus Torvalds authored
      d8ec26d7
    • Ilia Mirkin's avatar
      drm/nouveau/mxm: fix null deref on load · 72de1823
      Ilia Mirkin authored
      Since commit 61b365a5 ("drm/nouveau: populate master subdev pointer
      only when fully constructed"), the nouveau_mxm(bios) call will return
      NULL, since it's still being called from the constructor.  Instead, pass
      the mxm pointer via the unused data field.
      
      See https://bugs.freedesktop.org/show_bug.cgi?id=73791Reported-by: default avatarAndreas Reis <andreas.reis@gmail.com>
      Tested-by: default avatarAndreas Reis <andreas.reis@gmail.com>
      Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
      Cc: Ben Skeggs <bskeggs@redhat.com>
      Cc: Dave Airlie <airlied@linux.ie>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      72de1823
    • Linus Torvalds's avatar
      Merge tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 4d935402
      Linus Torvalds authored
      Pull last-minute ACPI fix from Rafael Wysocki:
       "This reverts a commit that causes the Alan Cox' ASUS T100TA to "crash
        and burn" during boot if the Baytrail pinctrl driver is compiled in"
      
      * tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs"
      4d935402
  2. 19 Jan, 2014 3 commits
  3. 18 Jan, 2014 9 commits
    • Rafael J. Wysocki's avatar
      Revert "ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs" · 2b844ba7
      Rafael J. Wysocki authored
      This reverts commit f6308b36 (ACPI: Add BayTrail SoC GPIO and LPSS
      ACPI IDs), because it causes the Alan Cox' ASUS T100TA to "crash and
      burn" during boot if the Baytrail pinctrl driver is compiled in.
      
      Fixes: f6308b36 (ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs)
      Reported-by: default avatarOne Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
      Requested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      2b844ba7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 7d0d46da
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) The value choosen for the new SO_MAX_PACING_RATE socket option on
          parisc was very poorly choosen, let's fix it while we still can.
          From Eric Dumazet.
      
       2) Our generic reciprocal divide was found to handle some edge cases
          incorrectly, part of this is encoded into the BPF as deep as the JIT
          engines themselves.  Just use a real divide throughout for now.
          From Eric Dumazet.
      
       3) Because the initial lookup is lockless, the TCP metrics engine can
          end up creating two entries for the same lookup key.  Fix this by
          doing a second lookup under the lock before we actually create the
          new entry.  From Christoph Paasch.
      
       4) Fix scatter-gather list init in usbnet driver, from Bjørn Mork.
      
       5) Fix unintended 32-bit truncation in cxgb4 driver's bit shifting.
          From Dan Carpenter.
      
       6) Netlink socket dumping uses the wrong socket state for timewait
          sockets.  Fix from Neal Cardwell.
      
       7) Fix netlink memory leak in ieee802154_add_iface(), from Christian
          Engelmayer.
      
       8) Multicast forwarding in ipv4 can overflow the per-rule reference
          counts, causing all multicast traffic to cease.  Fix from Hannes
          Frederic Sowa.
      
       9) via-rhine needs to stop all TX queues when it resets the device,
          from Richard Weinberger.
      
      10) Fix RDS per-cpu accesses broken by the this_cpu_* conversions.  From
          Gerald Schaefer.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        s390/bpf,jit: fix 32 bit divisions, use unsigned divide instructions
        parisc: fix SO_MAX_PACING_RATE typo
        ipv6: simplify detection of first operational link-local address on interface
        tcp: metrics: Avoid duplicate entries with the same destination-IP
        net: rds: fix per-cpu helper usage
        e1000e: Fix compilation warning when !CONFIG_PM_SLEEP
        bpf: do not use reciprocal divide
        be2net: add dma_mapping_error() check for dma_map_page()
        bnx2x: Don't release PCI bars on shutdown
        net,via-rhine: Fix tx_timeout handling
        batman-adv: fix batman-adv header overhead calculation
        qlge: Fix vlan netdev features.
        net: avoid reference counter overflows on fib_rules in multicast forwarding
        dm9601: add USB IDs for new dm96xx variants
        MAINTAINERS: add virtio-dev ML for virtio
        ieee802154: Fix memory leak in ieee802154_add_iface()
        net: usbnet: fix SG initialisation
        inet_diag: fix inet_diag_dump_icsk() to use correct state for timewait sockets
        cxgb4: silence shift wrapping static checker warning
      7d0d46da
    • Heiko Carstens's avatar
      s390/bpf,jit: fix 32 bit divisions, use unsigned divide instructions · 3af57f78
      Heiko Carstens authored
      The s390 bpf jit compiler emits the signed divide instructions "dr" and "d"
      for unsigned divisions.
      This can cause problems: the dividend will be zero extended to a 64 bit value
      and the divisor is the 32 bit signed value as specified A or X accumulator,
      even though A and X are supposed to be treated as unsigned values.
      
      The divide instrunctions will generate an exception if the result cannot be
      expressed with a 32 bit signed value.
      This is the case if e.g. the dividend is 0xffffffff and the divisor either 1
      or also 0xffffffff (signed: -1).
      
      To avoid all these issues simply use unsigned divide instructions.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3af57f78
    • Eric Dumazet's avatar
      parisc: fix SO_MAX_PACING_RATE typo · 75b99dbd
      Eric Dumazet authored
      SO_MAX_PACING_RATE definition on parisc got a typo.
      Its not too late to fix it, before 3.13 is official.
      
      Fixes: 62748f32 ("net: introduce SO_MAX_PACING_RATE")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      75b99dbd
    • Hannes Frederic Sowa's avatar
      ipv6: simplify detection of first operational link-local address on interface · 11ffff75
      Hannes Frederic Sowa authored
      In commit 1ec047eb ("ipv6: introduce per-interface counter for
      dad-completed ipv6 addresses") I build the detection of the first
      operational link-local address much to complex. Additionally this code
      now has a race condition.
      
      Replace it with a much simpler variant, which just scans the address
      list when duplicate address detection completes, to check if this is
      the first valid link local address and send RS and MLD reports then.
      
      Fixes: 1ec047eb ("ipv6: introduce per-interface counter for dad-completed ipv6 addresses")
      Reported-by: default avatarJiri Pirko <jiri@resnulli.us>
      Cc: Flavio Leitner <fbl@redhat.com>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Acked-by: default avatarFlavio Leitner <fbl@redhat.com>
      Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11ffff75
    • Christoph Paasch's avatar
      tcp: metrics: Avoid duplicate entries with the same destination-IP · 77f99ad1
      Christoph Paasch authored
      Because the tcp-metrics is an RCU-list, it may be that two
      soft-interrupts are inside __tcp_get_metrics() for the same
      destination-IP at the same time. If this destination-IP is not yet part of
      the tcp-metrics, both soft-interrupts will end up in tcpm_new and create
      a new entry for this IP.
      So, we will have two tcp-metrics with the same destination-IP in the list.
      
      This patch checks twice __tcp_get_metrics(). First without holding the
      lock, then while holding the lock. The second one is there to confirm
      that the entry has not been added by another soft-irq while waiting for
      the spin-lock.
      
      Fixes: 51c5d0c4 (tcp: Maintain dynamic metrics in local cache.)
      Signed-off-by: default avatarChristoph Paasch <christoph.paasch@uclouvain.be>
      Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      77f99ad1
    • Gerald Schaefer's avatar
      net: rds: fix per-cpu helper usage · c196403b
      Gerald Schaefer authored
      commit ae4b46e9 "net: rds: use this_cpu_* per-cpu helper" broke per-cpu
      handling for rds. chpfirst is the result of __this_cpu_read(), so it is
      an absolute pointer and not __percpu. Therefore, __this_cpu_write()
      should not operate on chpfirst, but rather on cache->percpu->first, just
      like __this_cpu_read() did before.
      
      Cc: <stable@vger.kernel.org> # 3.8+
      Signed-off-byd Gerald Schaefer <gerald.schaefer@de.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c196403b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 48ba620a
      Linus Torvalds authored
      Pull namespace fixes from Eric Biederman:
       "This is a set of 3 regression fixes.
      
        This fixes /proc/mounts when using "ip netns add <netns>" to display
        the actual mount point.
      
        This fixes a regression in clone that broke lxc-attach.
      
        This fixes a regression in the permission checks for mounting /proc
        that made proc unmountable if binfmt_misc was in use.  Oops.
      
        My apologies for sending this pull request so late.  Al Viro gave
        interesting review comments about the d_path fix that I wanted to
        address in detail before I sent this pull request.  Unfortunately a
        bad round of colds kept from addressing that in detail until today.
        The executive summary of the review was:
      
        Al: Is patching d_path really sufficient?
            The prepend_path, d_path, d_absolute_path, and __d_path family of
            functions is a really mess.
      
        Me: Yes, patching d_path is really sufficient.  Yes, the code is mess.
            No it is not appropriate to rewrite all of d_path for a regression
            that has existed for entirely too long already, when a two line
            change will do"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        vfs: Fix a regression in mounting proc
        fork:  Allow CLONE_PARENT after setns(CLONE_NEWPID)
        vfs: In d_path don't call d_dname on a mount point
      48ba620a
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 8f211b6c
      Linus Torvalds authored
      Pull KVM fix from Paolo Bonzini:
       "Fix for a brown paper bag bug.  Thanks to Drew Jones for noticing"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        kvm: x86: fix apic_base enable check
      8f211b6c
  4. 17 Jan, 2014 3 commits
  5. 16 Jan, 2014 14 commits