Skip to content
  1. Aug 28, 2013
  2. Aug 26, 2013
  3. Aug 24, 2013
  4. Aug 20, 2013
  5. Aug 19, 2013
    • Greg Kroah-Hartman's avatar
      Merge 3.11-rc6 into usb-next · bd479f29
      Greg Kroah-Hartman authored
      
      
      We want these USB fixes in this branch as well.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      bd479f29
    • Linus Torvalds's avatar
      Linux 3.11-rc6 · b36f4be3
      Linus Torvalds authored
      b36f4be3
    • Yann Droneaud's avatar
      USB: serial: fix stringify operator in usb-serial-simple · 68c91d37
      Yann Droneaud authored
      
      
      usb-serial-simple uses an unknown stringify macro that make
      all drivers being named "stringify(vendor)".
      
      This can be a problem when two drivers have the same (wrong) name:
      
          kernel: usbcore: registered new interface driver usb_serial_simple
          kernel: usbserial: USB Serial support registered for stringify(vendor)
          kernel Error: Driver 'stringify(vendor)' is already registered, aborting...
          kernel: usbserial: problem -16 when registering driver stringify(vendor)
          kernel: usbserial: USB Serial deregistering driver stringify(vendor)
          kernel: usbcore: deregistering interface driver usb_serial_simple
      
      Before the fix:
      
          $ strings drivers/usb/serial/usb-serial-simple.o
          usb_serial_simple
          stringify(vendor)
      
      After the fix:
      
          $ strings drivers/usb/serial/usb-serial-simple.o
          usb_serial_simple
          funsoft
          flashloader
          vivopay
          moto_modem
          hp4x
          suunto
          siemens_mpi
      
      This patch makes usb-serial-simple use the correct stringify operator.
      
      Signed-off-by: default avatarYann Droneaud <ydroneaud@opteya.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      68c91d37
  6. Aug 18, 2013
  7. Aug 17, 2013
    • Guenter Roeck's avatar
      s390: Fix broken build · 215b28a5
      Guenter Roeck authored
      Fix this build error:
      
        In file included from fs/exec.c:61:0:
        arch/s390/include/asm/tlb.h:35:23: error: expected identifier or '(' before 'unsigned'
        arch/s390/include/asm/tlb.h:36:1: warning: no semicolon at end of struct or union [enabled by default]
        arch/s390/include/asm/tlb.h: In function 'tlb_gather_mmu':
        arch/s390/include/asm/tlb.h:57:5: error: 'struct mmu_gather' has no member named 'end'
      
      Broken due to commit 2b047252
      
       ("Fix TLB gather virtual address range
      invalidation corner cases").
      
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      [ Oh well. We had build testing for ppc amd um, but no s390  - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      215b28a5
    • Robin Holt's avatar
      MAINTAINERS: Change ownership for SGI specific modules. · e180383f
      Robin Holt authored
      
      
      I have taken a different job.  I am removing myself as maintainer of
      GRU.  Dimitri will continue to maintain the SGI GRU driver, changing the
      XP/XPC/XPNET maintainer to Cliff Whickman, but leaving behind my
      personal email address to answer any questions about the design or
      operation of the XP family of drivers.
      
      Signed-off-by: default avatarRobin Holt <holt@sgi.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e180383f
    • Jan Kara's avatar
      jbd2: Fix oops in jbd2_journal_file_inode() · a361293f
      Jan Kara authored
      Commit 0713ed0c
      
       added
      jbd2_journal_file_inode() call into ext4_block_zero_page_range().
      However that function gets called from truncate path and thus inode
      needn't have jinode attached - that happens in ext4_file_open() but
      the file needn't be ever open since mount. Calling
      jbd2_journal_file_inode() without jinode attached results in the oops.
      
      We fix the problem by attaching jinode to inode also in ext4_truncate()
      and ext4_punch_hole() when we are going to zero out partial blocks.
      
      Reported-by: default avatarmajianpeng <majianpeng@gmail.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      a361293f
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 2620bf06
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "The usual collection of random fixes.  Also some further fixes to the
        last set of security fixes, and some more from Will (which you may
        already have in a slightly different form)"
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7807/1: kexec: validate CPU hotplug support
        ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lock
        ARM: 7811/1: locks: use early clobber in arch_spin_trylock
        ARM: 7810/1: perf: Fix array out of bounds access in armpmu_map_hw_event()
        ARM: 7809/1: perf: fix event validation for software group leaders
        ARM: Fix FIQ code on VIVT CPUs
        ARM: Fix !kuser helpers case
        ARM: Fix the world famous typo with is_gate_vma()
      2620bf06
    • Linus Torvalds's avatar
      Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 359d16ca
      Linus Torvalds authored
      Pull m68k fixes from Geert Uytterhoeven:
       "These are two critical fixes, needed by distro kernels, and thus also
        destined for stable:
      
         - The do_div() commit fixes a crash in mounting btrfs volumes, which
           was a regression from 3.2,
      
         - The ARAnyM fix allows to have NatFeat drivers as loadable modules,
           which is needed for initrds"
      
      * 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Truncate base in do_div()
        m68k/atari: ARAnyM - Fix NatFeat module support
      359d16ca
    • Linus Torvalds's avatar
      Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux · 0f7dd1aa
      Linus Torvalds authored
      Pull clock controller fixes from Michael Turquette:
       "Two small fixes for the Zynq clock controller introduced in 3.11-rc1
        and another Exynos clock patch which fixes a regression that prevents
        the video pipeline from functioning on that platform"
      
      * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
        clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks
        clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes
        clk/zynq/clkc: Add dedicated spinlock for the SWDT
      0f7dd1aa