Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 31, 2012
  1. Linux 3.3-rc2

    authored
  2. Merge tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream

    authored
    There are few important bug fixes for LogFS
    
    * tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream:
      Logfs: Allow NULL block_isbad() methods
      logfs: Grow inode in delete path
      logfs: Free areas before calling generic_shutdown_super()
      logfs: remove useless BUG_ON
      MAINTAINERS: Add Prasad Joshi in LogFS maintiners
      logfs: Propagate page parameter to __logfs_write_inode
      logfs: set superblock shutdown flag after generic sb shutdown
      logfs: take write mutex lock during fsync and sync
      logfs: Prevent memory corruption
      logfs: update page reference count for pined pages
    
    Fix up conflict in fs/logfs/dev_mtd.c due to semantic change in what
    "mtd->block_isbad" means in commit f2933e8: "Logfs: Allow NULL
    block_isbad() methods" clashing with the abstraction changes in the
    commits 7086c19: "mtd: introduce mtd_block_isbad interface" and
    d58b27e: "logfs: do not use 'mtd->block_isbad' directly".
    
    This resolution takes the semantics from commit f2933e8, and just
    makes mtd_block_isbad() return zero (false) if the 'block_isbad'
    function is NULL.  But that also means that now "mtd_can_have_bb()"
    always returns 0.
    
    Now, "mtd_block_markbad()" will obviously return an error if the
    low-level driver doesn't support bad blocks, so this is somewhat
    non-symmetric, but it actually makes sense if a NULL "block_isbad"
    function is considered to mean "I assume that all my blocks are always
    good".
  3. Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…

    authored
    …kernel/git/groeck/linux-staging
    
    * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
      hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F
      hwmon: (sht15) fix bad error code
      MAINTAINERS: Drop maintainer for MAX1668 hwmon driver
      MAINTAINERS: Add hwmon entries for Wolfson
      hwmon: (f71805f) Fix clamping of temperature limits
  4. Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/ker…

    authored
    …nel/git/linusw/linux-pinctrl
    
    Here are some fixes to the pin control system that has accumulated since
    -rc1.  Mainly Tony Lindgren fixed the module load/unload logic and the
    rest are minor fixes and documentation.
    
    * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
      pinctrl: add checks for empty function names
      pinctrl: fix pinmux_hog_maps when ctrl_dev_name is not set
      pinctrl: fix some pinmux typos
      pinctrl: free debugfs entries when unloading a pinmux driver
      pinctrl: unbreak error messages
      Documentation/pinctrl: fix a few syntax errors in code examples
      pinctrl: fix pinconf_pins_show iteration
Commits on Jan 30, 2012
  1. Merge tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/gregkh/tty
    
    Here are some tty/serial patches for 3.3-rc1
    
    Big thing here is the movement of the 8250 serial drivers to their own
    directory, now that the patch churn has calmed down.
    
    Other than that, only minor stuff (omap patches were reverted as they
    were found to be wrong), and another broken driver removed from the
    system.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    
    * tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
      serial: Kill off Moorestown code
      Revert "tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode"
      Revert "tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip"
      serial: Fix wakeup init logic to speed up startup
      docbook: don't use serial_core.h in device-drivers book
      serial: amba-pl011: lock console writes against interrupts
      amba-pl011: do not disable RTS during shutdown
      tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip
      tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode
      omap-serial: make serial_omap_restore_context depend on CONFIG_PM_RUNTIME
      omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP.
      TTY: fix UV serial console regression
      jsm: Fixed EEH recovery error
      Updated TTY MAINTAINERS info
      serial: group all the 8250 related code together
  2. Merge tag 'usb-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/gregkh/usb
    
    Here are a bunch of USB patches for 3.3-rc1.
    
    Nothing major, largest thing here is the removal of some drivers that
    did not work at all.  Other than that, the normal collection of bugfixes
    and new device ids.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    
    * tag 'usb-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (52 commits)
      uwb & wusb: fix kconfig error
      USB: Realtek cr: fix autopm scheduling while atomic
      USB: ftdi_sio: Add more identifiers
      xHCI: Cleanup isoc transfer ring when TD length mismatch found
      usb: musb: omap2430: minor cleanups.
      qcaux: add more Pantech UML190 and UML290 ports
      Revert "drivers: usb: Fix dependency for USB_HWA_HCD"
      usb: mv-otg - Fix build if CONFIG_USB is not set
      USB: cdc-wdm: Avoid hanging on interface with no USB_CDC_DMM_TYPE
      usb: add support for STA2X11 host driver
      drivers: usb: Fix dependency for USB_HWA_HCD
      kernel-doc: fix new warning in usb.h
      USB: OHCI: fix new compiler warnings
      usb: serial: kobil_sct: fix compile warning:
      drivers/usb/host/ehci-fsl.c: add missing iounmap
      USB: cdc-wdm: better allocate a buffer that is at least as big as we tell the USB core
      USB: cdc-wdm: call wake_up_all to allow driver to shutdown on device removal
      USB: cdc-wdm: use two mutexes to allow simultaneous read and write
      USB: cdc-wdm: updating desc->length must be protected by spin_lock
      USB: usbsevseg: fix max length
      ...
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    authored
    1) Setting link attributes can modify the size of the attributes that
       would be reported on a subsequent getlink netlink operation,
       therefore min_ifinfo_dump_size needs to be adjusted.  From Stefan
       Gula.
    
    2) Resegmentation of TSO frames while trimming can violate invariants
       expected by callers, namely that the number of segments can only stay
       the same or decrease, never increase.  If MSS changes, however, we
       can trim data but then end up with more segments.  Fix this by only
       segmenting to the MSS already recorded in the SKB.  That's the
       simplest fix for now and if we want to get more fancy in the future
       that's a more involved change.
    
       This probably explains some retransmit counter inaccuracies.
    
       From Neal Cardwell.
    
    3) Fix too-many-wakeups in POLL with AF_UNIX sockets, from Eric Dumazet.
    
    4) Fix CAIF crashes wrt.  namespace handling.  From Eric Dumazet and
       Eric W. Biederman.
    
    5) TCP port selection fixes from Flavio Leitner.
    
    6) More socket memory cgroup build fixes in certain randonfig
       situations.  From Glauber Costa.
    
    7) Fix TCP memory sysctl regression reported by Ingo Molnar, also from
       Glauber Costa.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      af_unix: fix EPOLLET regression for stream sockets
      tcp: fix tcp_trim_head() to adjust segment count with skb MSS
      net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL
      net caif: Register properly as a pernet subsystem.
      netns: Fail conspicously if someone uses net_generic at an inappropriate time.
      net: explicitly add jump_label.h header to sock.h
      net: RTNETLINK adjusting values of min_ifinfo_dump_size
      ipv6: Fix ip_gre lockless xmits.
      xen-netfront: correct MAX_TX_TARGET calculation.
      netns: fix net_alloc_generic()
      tcp: bind() optimize port allocation
      tcp: bind() fix autoselection to share ports
      l2tp: l2tp_ip - fix possible oops on packet receive
      iwlwifi: fix PCI-E transport "inta" race
      mac80211: set bss_conf.idle when vif is connected
      mac80211: update oper_channel on ibss join
  4. Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    authored
    …t/broonie/regulator
    
    This fixes an integration issue with the regulator device tree bindings
    which shook out in -rc.  The bindings were overly enthusiatic when
    deciding to set a voltage on a regulator and would try to set zero volts
    on an unconfigured regulator which isn't supported.
    
    * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
      regulator: Set apply_uV only when min and max voltages are defined
  5. @davem330

    af_unix: fix EPOLLET regression for stream sockets

    Eric Dumazet authored davem330 committed
    Commit 0884d7a (AF_UNIX: Fix poll blocking problem when reading from
    a stream socket) added a regression for epoll() in Edge Triggered mode
    (EPOLLET)
    
    Appropriate fix is to use skb_peek()/skb_unlink() instead of
    skb_dequeue(), and only call skb_unlink() when skb is fully consumed.
    
    This remove the need to requeue a partial skb into sk_receive_queue head
    and the extra sk->sk_data_ready() calls that added the regression.
    
    This is safe because once skb is given to sk_receive_queue, it is not
    modified by a writer, and readers are serialized by u->readlock mutex.
    
    This also reduce number of spinlock acquisition for small reads or
    MSG_PEEK users so should improve overall performance.
    
    Reported-by: Nick Mathewson <nickm@freehaven.net>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Cc: Alexey Moiseytsev <himeraster@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @davem330

    tcp: fix tcp_trim_head() to adjust segment count with skb MSS

    Neal Cardwell authored davem330 committed
    This commit fixes tcp_trim_head() to recalculate the number of
    segments in the skb with the skb's existing MSS, so trimming the head
    causes the skb segment count to be monotonically non-increasing - it
    should stay the same or go down, but not increase.
    
    Previously tcp_trim_head() used the current MSS of the connection. But
    if there was a decrease in MSS between original transmission and ACK
    (e.g. due to PMTUD), this could cause tcp_trim_head() to
    counter-intuitively increase the segment count when trimming bytes off
    the head of an skb. This violated assumptions in tcp_tso_acked() that
    tcp_trim_head() only decreases the packet count, so that packets_acked
    in tcp_tso_acked() could underflow, leading tcp_clean_rtx_queue() to
    pass u32 pkts_acked values as large as 0xffffffff to
    ca_ops->pkts_acked().
    
    As an aside, if tcp_trim_head() had really wanted the skb to reflect
    the current MSS, it should have called tcp_set_skb_tso_segs()
    unconditionally, since a decrease in MSS would mean that a
    single-packet skb should now be sliced into multiple segments.
    
    Signed-off-by: Neal Cardwell <ncardwell@google.com>
    Acked-by: Nandita Dukkipati <nanditad@google.com>
    Acked-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL

    Glauber Costa authored davem330 committed
    sysctl_tcp_mem() initialization was moved to sysctl_tcp_ipv4.c
    in commit 3dc43e3, since it
    became a per-ns value.
    
    That code, however, will never run when CONFIG_SYSCTL is
    disabled, leading to bogus values on those fields - causing hung
    TCP sockets.
    
    This patch fixes it by keeping an initialization code in
    tcp_init(). It will be overwritten by the first net namespace
    init if CONFIG_SYSCTL is compiled in, and do the right thing if
    it is compiled out.
    
    It is also named properly as tcp_init_mem(), to properly signal
    its non-sysctl side effect on TCP limits.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Glauber Costa <glommer@parallels.com>
    Cc: David S. Miller <davem@davemloft.net>
    Link: http://lkml.kernel.org/r/4F22D05A.8030604@parallels.com
    [ renamed the function, tidied up the changelog a bit ]
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/s390/linux
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      [S390] dasd: revalidate server for new pathgroup
      [S390] dasd: revert LCU optimization
      [S390] cleanup entry point definition
  9. Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

    authored
    * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
      microblaze: generic atomic64 support
  10. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      vmwgfx: Fix assignment in vmw_framebuffer_create_handle
      drm/radeon/kms: Fix device tree linkage of i2c buses
      drm: Pass the real error code back during GEM bo initialisation
      Revert "drm/i810: cleanup reclaim_buffers"
  11. Merge tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy…

    authored
    …/linux-nfs
    
    NFS client bugfixes for Linux 3.3 (pull 3)
    
    * tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
      SUNRPC: Fix machine creds in generic_create_cred and generic_match
  12. Merge tag 'pm-fix-for-3.3-rc2' of git://git.kernel.org/pub/scm/linux/…

    authored
    …kernel/git/rafael/linux-pm
    
    Power management fix for 3.3-rc2
    
    Fix for a hibernate (s2disk) regression introduced during the 3.2
    merge window that causes s2disk to trigger BUG_ON() in
    freeze_workqueues_begin() if there is not enough swap space to save
    the image.
    
    * tag 'pm-fix-for-3.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      PM / Hibernate: Fix s2disk regression related to freezing workqueues
  13. @RyanMallon

    vmwgfx: Fix assignment in vmw_framebuffer_create_handle

    RyanMallon authored Dave Airlie committed
    The assignment of handle in vmw_framebuffer_create_handle doesn't actually do anything useful and is incorrectly assigning an integer value to a pointer argument. It appears that this is a typo and should be dereferencing handle rather than assigning to it directly. This fixes a bug where an undefined handle value is potentially returned to user-space.
    
    Signed-off-by: Ryan Mallon <rmallon@gmail.com>
    Reviewed-by: Jakob Bornecrantz<jakob@vmware.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  14. @jdelvare

    drm/radeon/kms: Fix device tree linkage of i2c buses

    jdelvare authored Dave Airlie committed
    Properly set the parent device of i2c buses before registering them so
    that they will show at the right place in the device tree (rather than
    in /sys/devices directly.)
    
    Signed-off-by: Jean Delvare <jdelvare@suse.de>
    Cc: Dave Airlie <airlied@gmail.com>
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  15. @ickle

    drm: Pass the real error code back during GEM bo initialisation

    ickle authored Dave Airlie committed
    In particular, I found I was hitting the max-file limit in the VFS,
    and the EFILE was being magically transformed into ENOMEM. Confusion
    reigns.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  16. @danvet

    Revert "drm/i810: cleanup reclaim_buffers"

    danvet authored Dave Airlie committed
    This reverts commit 87499ff.
    
    Where is that paper bag ... ah here.
    
    I've failed to take an odd interaction between my other cleanups and
    this reclaim_buffers patch into account and also failed to properly
    test it. Looks like there are more dragons and hidden trapdoors in the
    drm release path than actual lines of code.
    
    Until I get a clue, let's just revert this.
    
    Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Commits on Jan 29, 2012
  1. @groeck

    hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F

    groeck authored Guenter Roeck committed
    NCT6776F only supports pwm mode for pwm2 and pwm3. Return error if an attempt
    is made to set those pwm channels to DC mode.
    
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Cc: stable@vger.kernel.org # 3.0+
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
  2. @rjwysocki

    PM / Hibernate: Fix s2disk regression related to freezing workqueues

    rjwysocki authored
    Commit 2aede85
    
      PM / Hibernate: Freeze kernel threads after preallocating memory
    
    introduced a mechanism by which kernel threads were frozen after
    the preallocation of hibernate image memory to avoid problems with
    frozen kernel threads not responding to memory freeing requests.
    However, it overlooked the s2disk code path in which the
    SNAPSHOT_CREATE_IMAGE ioctl was run directly after SNAPSHOT_FREE,
    which caused freeze_workqueues_begin() to BUG(), because it saw
    that worqueues had been already frozen.
    
    Although in principle this issue might be addressed by removing
    the relevant BUG_ON() from freeze_workqueues_begin(), that would
    reintroduce the very problem that commit 2aede85
    attempted to avoid into that particular code path.  For this reason,
    to fix the issue at hand, introduce thaw_kernel_threads() and make
    the SNAPSHOT_FREE ioctl execute it.
    
    Special thanks to Srivatsa S. Bhat for detailed analysis of the
    problem.
    
    Reported-and-tested-by: Jiri Slaby <jslaby@suse.cz>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
    Cc: stable@kernel.org
  3. @vivien

    hwmon: (sht15) fix bad error code

    vivien authored Guenter Roeck committed
    When no platform data was supplied, returned error code was 0.
    
    Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
    Cc: stable@vger.kernel.org # 2.6.32+
    Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
  4. Merge tag 'driver-core-3.3-rc1-bugfixes' of git://git.kernel.org/pub/…

    authored
    …scm/linux/kernel/git/gregkh/driver-core
    
    Here are some patches for the 3.3-rc1 tree.
    
    It contains the removal of the sysdev code, now that all users of it are
    gone, as well as some sysfs bugfixes that have been reported by users.
    There are also some documentation updates here as well.
    
    * tag 'driver-core-3.3-rc1-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
      sysfs: Complain bitterly about attempts to remove files from nonexistent directories.
      stable: update documentation to ask for kernel version
      base/core.c:fix typo in comment in function device_add
      Documentation: devres: add allocation functions to list of supported calls
      Documentation update for the driver model core
      kernel-doc: fix new warnings in driver-core
      kernel-doc: fix new warnings in debugfs
      kernel-doc: fix new warnings in device.h
      driver core: remove drivers/base/sys.c and include/linux/sysdev.h
  5. Merge tag 'for-linus' of git://github.com/rustyrussell/linux

    authored
    * tag 'for-linus' of git://github.com/rustyrussell/linux:
      lguest: remove reference from Documentation/virtual/00-INDEX
      virtio: correct the memory barrier in virtqueue_kick_prepare()
      virtio: fix typos of memory barriers
  6. Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub…

    authored
    …/scm/linux/kernel/git/konrad/xen
    
    * 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/granttable: Disable grant v2 for HVM domains.
      x86: xen: size struct xen_spinlock to always fit in arch_spinlock_t
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/mason/linux-btrfs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: fix reservations in btrfs_page_mkwrite
      Btrfs: advance window_start if we're using a bitmap
      btrfs: mask out gfp flags in releasepage
      Btrfs: fix enospc error caused by wrong checks of the chunk
      Btrfs: do not defrag a file partially
      Btrfs: fix warning for 32-bit build of fs/btrfs/check-integrity.c
      Btrfs: use cluster->window_start when allocating from a cluster bitmap
      Btrfs: Check for NULL page in extent_range_uptodate
      btrfs: Fix busyloops in transaction waiting code
      Btrfs: make sure a bitmap has enough bytes
      Btrfs: fix uninit warning in backref.c
  8. Merge git://www.linux-watchdog.org/linux-watchdog

    authored
    * git://www.linux-watchdog.org/linux-watchdog:
      watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs
      watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev
      watchdog: Fix typo "unexpectdly"
      watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
      watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
      watchdog: Return proper error in nuc900wdt_probe if misc_register fails
      watchdog: Staticise nuc900_wdt
      watchdog: via_wdt: Staticise wdt_pci_table
      watchdog: omap_wdt.c: Fix the mismatch of pm_runtime enable and disable
      watchdog: dw_wdt.c: use devm_request_and_ioremap
      watchdog: imx2_wdt.c: use devm_request_and_ioremap
Commits on Jan 28, 2012
  1. Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

    authored
    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits)
      ARM: 7304/1: ioremap: fix boundary check when reusing static mapping
      ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
      ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2
      ARM: 7298/1: realview: fix mapping of MPCore private memory region
      PCMCIA: fix sa1111 oops on remove
      ARM: 7288/1: mach-sa1100: add missing module_init() call
      ARM: 7297/1: smp_twd: make sure timer is stopped before registering it
      ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
      ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
      ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
      ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
      ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
      ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes
      MFD: ucb1x00-ts: fix resume failure
      MFD: ucb1x00-core: fix gpiolib direction_output handling
      MFD: ucb1x00-core: fix missing restore of io output data on resume
      MFD: mcp-core: fix mcp_priv() to be more type safe
      MFD: mcp-core: fix complaints from the genirq layer
      Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
      Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
      ...
    
    Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into
    mach-imx5 (commit 784a90c: "ARM i.MX: Merge i.MX5 support into
    mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by
    the CPU_V7 logic from it in the old location in rmk's branch (commit
    a092f2b: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for
    ARMv7 CPUs").
  2. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    authored
    …nel/git/arm/arm-soc
    
    arm-soc fixes for 3.3-rc:
    
    AT91 needed reset fixes which resulted in some minor code refactoring,
    it also adds a feature-removal for one of their platforms for 3.4.
    The USB patches have been acked by Greg K-H.
    
    i.MX and ux500 both have some minor fixes, nothing controversial.
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
      ARM: imx: iomux-v1.h: Fix build error due to __init annotation
      ARM: at91: Fix at91sam9g45 and at91cap9 reset
      ARM: at91: make rstc soc independent
      ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
      ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
      ARM: at91: fix cap9 ddrsdr register
      ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
      USB: at91: fix clk_get error handling
      ARM: at91: removal of CAP9 SoC family
      ARM: at91: fix at91rm9200 soc subtype handling
      mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
      mach-ux500: enable ARM errata 764369
      mach-ux500: do not override outer.inv_all
      mach-ux500: musb: now musb is always in OTG mode
      ARM: imx6: add missing twd_clk for imx6q clock
  3. @prasad-joshi

    Logfs: Allow NULL block_isbad() methods

    Joern Engel authored prasad-joshi committed
    Not all mtd drivers define block_isbad().  Let's assume no bad blocks
    instead of refusing to mount.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
  4. @prasad-joshi

    logfs: Grow inode in delete path

    Joern Engel authored prasad-joshi committed
    Can be necessary if an inode gets deleted (through -ENOSPC) before being
    written.  Might be better to move this into logfs_write_rec(), but for
    now go with the stupid&safe patch.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
  5. @prasad-joshi

    logfs: Free areas before calling generic_shutdown_super()

    Joern Engel authored prasad-joshi committed
    Or hit an assertion in map_invalidatepage() instead.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
  6. @prasad-joshi

    logfs: remove useless BUG_ON

    Joern Engel authored prasad-joshi committed
    It prevents write sizes >4k.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
  7. @prasad-joshi

    MAINTAINERS: Add Prasad Joshi in LogFS maintiners

    prasad-joshi authored
    Acked-by: Joern Engel <joern@logfs.org>
    Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
Something went wrong with that request. Please try again.