1. 09 Jan, 2012 40 commits
    • Linus Torvalds's avatar
      Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b3c37522
      Linus Torvalds authored
      power management changes for omap and imx
      
      A significant part of the changes for these two platforms went into
      power management, so they are split out into a separate branch.
      
      * tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)
        ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
        ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation
        ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
        ARM: imx6q: build pm code only when CONFIG_PM selected
        ARM: mx5: use generic irq chip pm interface for pm functions on
        ARM: omap: pass minimal SoC/board data for UART from dt
        arm/dts: Add minimal device tree support for omap2420 and omap2430
        omap-serial: Add minimal device tree support
        omap-serial: Use default clock speed (48Mhz) if not specified
        omap-serial: Get rid of all pdev->id usage
        ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init
        ARM: OMAP4: PRM: use PRCM interrupt handler
        ARM: OMAP3: pm: use prcm chain handler
        ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad
        ARM: OMAP2+: mux: add support for PAD wakeup interrupts
        ARM: OMAP: PRCM: add suspend prepare / finish support
        ARM: OMAP: PRCM: add support for chain interrupt handler
        ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier
        ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup
        ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list
        ...
      b3c37522
    • Linus Torvalds's avatar
      Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2ac9d7aa
      Linus Torvalds authored
      Driver specific changes
      
      Again, a lot of platforms have changes in here: pxa, samsung, omap,
      at91, imx, ...
      
      * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
        ARM: sa1100: clean up of the clock support
        ARM: pxa: add dummy clock for sa1100-rtc
        RTC: sa1100: support sa1100, pxa and mmp soc families
        RTC: sa1100: remove redundant code of setting alarm
        RTC: sa1100: Clean out ost register
        Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
        pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
        ARM: EXYNOS: Modified files for SPI consolidation work
        ARM: S5P64X0: Enable SDHCI support
        ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
        ARM: S5P64X0: Add HSMMC setup for host Controller
        ARM: EXYNOS: Add USB OHCI support to ORIGEN board
        USB: Add Samsung Exynos OHCI diver
        ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
        ARM: EXYNOS: Add USB OHCI device
        net: macb: fix build break with !CONFIG_OF
        i2c: tegra: Support DVC controller in device tree
        i2c: tegra: Add __devinit/exit to probe/remove
        net/at91_ether: use gpio_is_valid for phy IRQ line
        ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
        ...
      2ac9d7aa
    • Linus Torvalds's avatar
      Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 5ede3ceb
      Linus Torvalds authored
      New feature development
      
      This adds support for new features, and contains stuff from most
      platforms. A number of these patches could have fit into other
      branches, too, but were small enough not to cause too much
      confusion here.
      
      * tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
        mfd/db8500-prcmu: remove support for early silicon revisions
        ARM: ux500: fix the smp_twd clock calculation
        ARM: ux500: remove support for early silicon revisions
        ARM: ux500: update register files
        ARM: ux500: register DB5500 PMU dynamically
        ARM: ux500: update ASIC detection for U5500
        ARM: ux500: support DB8520
        ARM: picoxcell: implement watchdog restart
        ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C
        ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1
        ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4
        ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3
        ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3
        ARM: Orion: Remove address map info from all platform data structures
        ARM: Orion: Get address map from plat-orion instead of via platform_data
        ARM: Orion: mbus_dram_info consolidation
        ARM: Orion: Consolidate the address map setup
        ARM: Kirkwood: Add configuration for MPP12 as GPIO
        ARM: Kirkwood: Recognize A1 revision of 6282 chip
        ARM: ux500: update the MOP500 GPIO assignments
        ...
      5ede3ceb
    • Linus Torvalds's avatar
      Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6d889d03
      Linus Torvalds authored
      Board-level changes
      
      This adds and extends support for specific boards on a number of
      ARM platforms:  omap, imx, samsung, tegra, ...
      
      * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
        Enable 32 bit flash support for iMX21ADS board
        ARM: mx31pdk: Add MC13783 RTC support
        iomux-mx25: configuration to support CSPI3 on CSI pins
        MX1:apf9328: Add i2c support
        mioa701: add newly available DoC G3 chip
        arm/tegra: remove __initdata annotation from pinmux tables
        arm/tegra: Use bus notifiers to trigger pinmux setup
        arm/tegra: Refactor board-*-pinmux.c to share code
        arm/tegra: Fix mistake in Trimslice's pinmux
        arm/tegra: Rework Seaboard-vs-Ventana pinmux table
        arm/tegra: Remove useless entries from ventana_pinmux[]
        arm/tegra: PCIe: Remove include of mach/pinmux.h
        arm/tegra: Harmony PCIe: Don't touch pinmux
        arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio
        arm/tegra: Split Seaboard GPIO table to allow for Ventana
        ARM: imx6q: generate imx6q dtb files
        arm/imx6q: Rename Sabreauto to Armadillo2
        arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
        arm/imx6: add imx6q sabrelite board support
        dts/imx: rename uart labels to consistent with hw spec
        ...
      6d889d03
    • Linus Torvalds's avatar
      Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7400c12e
      Linus Torvalds authored
      SoC-level changes for tegra and omap
      
      This adds support for the new tegra30 SoC, as well as small
      changes to support minor variations of existing omap SoCs.
      
      * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)
        arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF
        arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC
        arm/tegra: Delete tegra_init_clock()
        arm/tegra: Fix section mismatch errors in tegra30 pinmux
        arm/tegra: Fix section mismatch errors in tegra20 pinmux
        arm/tegra: refresh defconfig for tegra30
        arm/tegra: add support for tegra30 based board cardhu
        arm/tegra: implement support for tegra30
        arm/tegra: pinmux tables and definitions for tegra30
        arm/tegra: add new fields to struct tegra_pingroup_desc
        arm/tegra: prepare pinmux code for multiple tegra variants
        arm/tegra: rename tegra20 pinmux files
        arm/tegra: generalize L2 cache initialization
        arm/tegra: use PMC reset
        arm/tegra: rename board-dt.c to board-dt-tegra20.c
        arm/tegra: prepare early init for multiple tegra variants
        arm/tegra: don't export clk_measure_input_freq
        arm/tegra: prepare clock code for multiple tegra variants
        arm/tegra: cleanup tegra20 support
        arm/tegra: clk_get should not be fatal
        ...
      
      Fix up trivial conflict in arch/arm/mach-tegra/board-dt-tegra20.c
      7400c12e
    • Linus Torvalds's avatar
      Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 190a44e6
      Linus Torvalds authored
      Cleanups for the Samsung platforms
      
      Various cleanup changes that the device driver changes are built upon.
      Since the samsung cleanups depend on the device tree series, which
      depends on the first set of cleanups for tegra.
      
      * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: EXYNOS: Use gpio_request_one
        ARM: S5PV210: Use gpio_request_one
        ARM: S3C64XX: Modified according to SPI consolidation work
        ARM: S5PV210: Modified files for SPI consolidation work
        ARM: S5P64X0: Modified files for SPI consolidation work
        ARM: S5PC100: Modified files for SPI consolidation work
        ARM: S3C64XX: Modified files for SPI consolidation work
        ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung
        ARM: SAMSUNG: Remove SPI bus clocks from platform data
        ARM: S5PV210: Add SPI clkdev support
        ARM: S5P64X0: Add SPI clkdev support
        ARM: S5PC100: Add SPI clkdev support
        ARM: S3C64XX: Add SPI clkdev support
        spi/s3c64xx: Use bus clocks created using clkdev
        mmc: sdhci-s3c: Use generic clock names for sdhci bus clock options
        ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names
        ARM: SAMSUNG: Remove SDHCI bus clocks from platform data
        ARM: SAMSUNG: Use kmemdup rather than duplicating its implementation
        ARM: EXYNOS: remove exynos4_scu_enable()
      190a44e6
    • Linus Torvalds's avatar
      Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dfc1ebe7
      Linus Torvalds authored
      Device tree conversions for samsung and tegra
      
      Both platforms had some initial device tree support, but this adds
      much more to actually make it usable.
      
      * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
        ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN
        ARM: EXYNOS: Add Exynos4 device tree enabled board file
        rtc: rtc-s3c: Add device tree support
        input: samsung-keypad: Add device tree support
        ARM: S5PV210: Modify platform data for pl330 driver
        ARM: S5PC100: Modify platform data for pl330 driver
        ARM: S5P64x0: Modify platform data for pl330 driver
        ARM: EXYNOS: Add a alias for pdma clocks
        ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build
        ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers
        DMA: PL330: Add device tree support
        ARM: EXYNOS: Modify platform data for pl330 driver
        DMA: PL330: Infer transfer direction from transfer request instead of platform data
        DMA: PL330: move filter function into driver
        serial: samsung: Fix build for non-Exynos4210 devices
        serial: samsung: add device tree support
        serial: samsung: merge probe() function from all SoC specific extensions
        serial: samsung: merge all SoC specific port reset functions
        ARM: SAMSUNG: register uart clocks to clock lookup list
        serial: samsung: remove all uses of get_clksrc and set_clksrc
        ...
      
      Fix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and
      drivers/tty/serial/Kconfig both due to just adding code close to
      changes.
      dfc1ebe7
    • Linus Torvalds's avatar
      Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · acc952c1
      Linus Torvalds authored
      Cleanups on various subarchitectures
      
      Cleanup patches for various ARM platforms and some of their associated
      drivers, the bulk of these is for mach-91.
      
      Arnd ended up pulling in the restart branch from Russell in order to
      fix up some simple but annoying merge conflicts.
      
      * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
        arm/at91: fix build of stamp9g20
        ARM: u300: delete memory.h
        MAINTAINERS: add maintainer entry for Picochip picoxcell
        ARM: picoxcell: move io mappings to common.c
        ARM: picoxcell: don't reserve irq_descs
        ARM: picoxcell: remove mach/memory.h
        ARM: at91: delete the pcontrol_g20_defconfig
        arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
        arm/tegra: remove unused defines
        arm/tegra: fix variable formatting in makefile
        ARM: davinci: vpif: move code to driver core header from platform
        ARM: at91/gpio: fix display of number of irq setuped
        ARM: at91/gpio: drop PIN_BASE
        ARM: at91/udc: use gpio_is_valid to check the gpio
        ARM: at91/ohci: use gpio_is_valid to check the gpio
        ARM: at91/nand: use gpio_is_valid to check the gpio
        ARM: at91/mmc: use gpio_is_valid to check the gpio
        ARM: at91/ide: use gpio_is_valid to check the gpio
        ARM: at91/pata: use gpio_is_valid to check the gpio
        ARM: at91/soc: use gpio_is_valid to check the gpio
        ...
      acc952c1
    • Linus Torvalds's avatar
      Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 57e964e1
      Linus Torvalds authored
      Non-critical bug fixes
      
      Simple bug fixes that were not considered important enough for inclusion
      into 3.2.
      
      * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: update pxa and mmp
        ARM: pxa: Include linux/export.h in balloon3.c
        ARM: OMAP4: clock: Add CPU local timer clock node
        ARM: OMAP4: hwmod: Don't wait for the idle status if modulemode is not supported
        ARM: OMAP: AM3517/3505: fix crash on boot due to incorrect voltagedomain data
        ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot
        ARM: OMAP2+: DMA: Workaround for invalid destination position
        ARM: OMAP2+: DMA: Workaround for invalid source position
      57e964e1
    • Steven Rostedt's avatar
      tracing/mm: Move include of trace/events/kmem.h out of header into slab.c · 4dee6b64
      Steven Rostedt authored
      Including trace/events/*.h TRACE_EVENT() macro headers in other headers
      can cause strange side effects if another trace/event/*.h header
      includes that header.  Having trace/events/kmem.h inside slab_def.h
      caused a compile error in sparc64 when changes were done to some header
      files.  Moving the kmem.h trace header out of slab.h and into slab.c
      fixes the problem.
      
      Note, both slub.c and slob.c already include the trace/events/kmem.h
      file. Only slab.c had it missing.
      
      Link: http://lkml.kernel.org/r/20120105190405.1e3191fb5a43b2a0f1655e1f@canb.auug.org.auReported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4dee6b64
    • Linus Torvalds's avatar
      Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 6b3da11b
      Linus Torvalds authored
      * 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: Remove irqsafe_cpu_xxx variants
      
      Fix up conflict in arch/x86/include/asm/percpu.h due to clash with
      cebef5be ("x86: Fix and improve percpu_cmpxchg{8,16}b_double()")
      which edited the (now removed) irqsafe_cpu_cmpxchg*_double code.
      6b3da11b
    • Linus Torvalds's avatar
      Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · db0c2bf6
      Linus Torvalds authored
      * 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)
        cgroup: fix to allow mounting a hierarchy by name
        cgroup: move assignement out of condition in cgroup_attach_proc()
        cgroup: Remove task_lock() from cgroup_post_fork()
        cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()
        cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static
        cgroup: only need to check oldcgrp==newgrp once
        cgroup: remove redundant get/put of task struct
        cgroup: remove redundant get/put of old css_set from migrate
        cgroup: Remove unnecessary task_lock before fetching css_set on migration
        cgroup: Drop task_lock(parent) on cgroup_fork()
        cgroups: remove redundant get/put of css_set from css_set_check_fetched()
        resource cgroups: remove bogus cast
        cgroup: kill subsys->can_attach_task(), pre_attach() and attach_task()
        cgroup, cpuset: don't use ss->pre_attach()
        cgroup: don't use subsys->can_attach_task() or ->attach_task()
        cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_attach() and attach()
        cgroup: improve old cgroup handling in cgroup_attach_proc()
        cgroup: always lock threadgroup during migration
        threadgroup: extend threadgroup_lock() to cover exit and exec
        threadgroup: rename signal->threadgroup_fork_lock to ->group_rwsem
        ...
      
      Fix up conflict in kernel/cgroup.c due to commit e0197aae: "cgroups:
      fix a css_set not found bug in cgroup_attach_proc" that already
      mentioned that the bug is fixed (differently) in Tejun's cgroup
      patchset. This one, in other words.
      db0c2bf6
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · ac69e092
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2/3/4: delete unneeded includes of module.h
        ext{3,4}: Fix potential race when setversion ioctl updates inode
        udf: Mark LVID buffer as uptodate before marking it dirty
        ext3: Don't warn from writepage when readonly inode is spotted after error
        jbd: Remove j_barrier mutex
        reiserfs: Force inode evictions before umount to avoid crash
        reiserfs: Fix quota mount option parsing
        udf: Treat symlink component of type 2 as /
        udf: Fix deadlock when converting file from in-ICB one to normal one
        udf: Cleanup calling convention of inode_getblk()
        ext2: Fix error handling on inode bitmap corruption
        ext3: Fix error handling on inode bitmap corruption
        ext3: replace ll_rw_block with other functions
        ext3: NULL dereference in ext3_evict_inode()
        jbd: clear revoked flag on buffers before a new transaction started
        ext3: call ext3_mark_recovery_complete() when recovery is really needed
      ac69e092
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 9e203936
      Linus Torvalds authored
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        ore: Must support none-PAGE-aligned IO
        ore: fix BUG_ON, too few sgs when reading
        ore: Fix crash in case of an IO error.
        ore: FIX breakage when MISC_FILESYSTEMS is not set
      9e203936
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 993ecff8
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: fix endian conversion issue in discard code
      993ecff8
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 12e55508
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
        net/hyperv: Add support for jumbo frame up to 64KB
        net/hyperv: Add NETVSP protocol version negotiation
        net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
        staging/rtl8192e: Register against lib80211
        staging/rtl8192e: Convert to lib80211_crypt_info
        staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
        staging/rtl8192e: Add lib80211.h to rtllib.h
        staging/mei: add watchdog device registration wrappers
        drm/omap: GEM, deal with cache
        staging: vt6656: int.c, int.h: Change return of function to void
        staging: usbip: removed unused definitions from header
        staging: usbip: removed dead code from receive function
        staging:iio: Drop {mark,unmark}_in_use callbacks
        staging:iio: Drop buffer mark_param_change callback
        staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
        staging:iio: Drop buffer busy flag
        staging:iio: Make sure a device is only opened once at a time
        staging:iio: Disallow modifying buffer size when buffer is enabled
        staging:iio: Disallow changing scan elements in all buffered modes
        staging:iio: Use iio_buffer_enabled instead of open coding it
        ...
      
      Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
      module_init due to using module_i2c_driver() helper, next to removal of
      MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).
      12e55508
    • Linus Torvalds's avatar
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 55b81e6f
      Linus Torvalds authored
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)
        USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c
        xhci: Clean up 32-bit build warnings.
        USB: update documentation for usbmon
        usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops
        drivers/usb/class/cdc-acm.c: clear dangling pointer
        drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree
        drivers/usb/host/isp1760-if.c: introduce missing kfree
        usb: option: add ZD Incorporated HSPA modem
        usb: ch9: fix up MaxStreams helper
        USB: usb-skeleton.c: cleanup open_count
        USB: usb-skeleton.c: fix open/disconnect race
        xhci: Properly handle COMP_2ND_BW_ERR
        USB: remove dead code from suspend/resume path
        USB: add quirk for another camera
        drivers: usb: wusbcore: Fix dependency for USB_WUSB
        xhci: Better debugging for critical host errors.
        xhci: Be less verbose during URB cancellation.
        xhci: Remove debugging about ring structure allocation.
        xhci: Remove debugging about toggling cycle bits.
        xhci: Remove debugging for individual transfers.
        ...
      55b81e6f
    • Linus Torvalds's avatar
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 5983faf9
      Linus Torvalds authored
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (65 commits)
        tty: serial: imx: move del_timer_sync() to avoid potential deadlock
        imx: add polled io uart methods
        imx: Add save/restore functions for UART control regs
        serial/imx: let probing fail for the dt case without a valid alias
        serial/imx: propagate error from of_alias_get_id instead of using -ENODEV
        tty: serial: imx: Allow UART to be a source for wakeup
        serial: driver for m32 arch should not have DEC alpha errata
        serial/documentation: fix documented name of DCD cpp symbol
        atmel_serial: fix spinlock lockup in RS485 code
        tty: Fix memory leak in virtual console when enable unicode translation
        serial: use DIV_ROUND_CLOSEST instead of open coding it
        serial: add support for 400 and 800 v3 series Titan cards
        serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.
        serial: bfin-uart: Enable hardware automatic CTS only when CTS pin is available.
        serial: make FSL errata depend on 8250_CONSOLE, not just 8250
        serial: add irq handler for Freescale 16550 errata.
        serial: manually inline serial8250_handle_port
        serial: make 8250 timeout use the specified IRQ handler
        serial: export the key functions for an 8250 IRQ handler
        serial: clean up parameter passing for 8250 Rx IRQ handling
        ...
      5983faf9
    • Linus Torvalds's avatar
      Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 21a2cb56
      Linus Torvalds authored
      * 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        isl29020: Remove a redundant semi-colon from return statement
        BMP085: Remove redundant semi-colon from return statement
        drivers:misc: ti-st: DEBUG uart, baud rate mods
        drivers:misc: ti-st: flush UART upon fw failure
        drivers:misc: ti-st: protect registrations
        char_dev.c: fix up some whitespace errors
        s390: tape_class.h: remove kobj_map.h inclusion
        misc: ad525x_dpot: Add support for SPI module device table matching
      21a2cb56
    • Arnd Bergmann's avatar
      Merge branch 'samsung/cleanup' into next/boards · 421b759b
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-imx/mach-imx6q.c
      	arch/arm/mach-omap2/board-ti8168evm.c
      	arch/arm/mach-s3c64xx/Kconfig
      	arch/arm/mach-tegra/Makefile
      	arch/arm/mach-tegra/board-dt-tegra20.c
      	arch/arm/mach-tegra/common.c
      
      Lots of relatively simple conflicts between the board
      changes and stuff from the arm tree. This pulls in
      the resolution from the samsung/cleanup tree, so we
      don't get conflicting merges.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      421b759b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · c99516ca
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()
        exofs: oops after late failure in mount
        devpts: fix double-free on mount failure
        ... and the same for gadgetfs
        functionfs: unfuck failure exits on mount
      c99516ca
    • Arnd Bergmann's avatar
      Merge branch 'samsung/driver' into next/drivers · dcf7ec5e
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-mxs/include/mach/common.h
      
      Pull in previous samsung conflict merges and do a trivial
      merge of an mxs double-add conflict.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      dcf7ec5e
    • Arnd Bergmann's avatar
      Merge branch 'samsung/cleanup' into samsung/driver · 142f2101
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-s5p64x0/cpu.c -> common.c
      
      More changes to a file that got moved into common.c,
      see previous conflict resolutions.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      142f2101
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 72f31889
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)
        [S390] disassembler: mark exception causing instructions
        [S390] Enable exception traces by default
        [S390] return address of compat signals
        [S390] sysctl: get rid of dead declaration
        [S390] dasd: fix fixpoint divide exception in define_extent
        [S390] dasd: add sanity check to detect path connection error
        [S390] qdio: fix kernel panic for zfcp 31-bit
        [S390] Add s390x description to Documentation/kdump/kdump.txt
        [S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo
        [S390] dasd: fix expiration handling for recovery requests
        [S390] outstanding interrupts vs. smp_send_stop
        [S390] ipc: call generic sys_ipc demultiplexer
        [S390] zcrypt: Fix error return codes.
        [S390] zcrypt: Rework length parameter checking.
        [S390] cleanup trap handling
        [S390] Remove Kerntypes leftovers
        [S390] topology: increase poll frequency if change is anticipated
        [S390] entry[64].S improvements
        [S390] make arch/s390 subdirectories depend on config option
        [S390] kvm: move cmf host id constant out of lowcore
        ...
      
      Fix up conflicts in arch/s390/kernel/{smp.c,topology.c} due to the
      sysdev removal clashing with "topology: get rid of ifdefs" which moved
      some of that code around.
      72f31889
    • Arnd Bergmann's avatar
      b48741cc
    • Arnd Bergmann's avatar
      Merge branch 'samsung/dt' into samsung/cleanup · a07613a5
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-s3c64xx/Makefile
      	arch/arm/mach-s5pc100/Makefile
      	arch/arm/mach-s5pv210/Makefile
      
      Pull in previously resolved conflicts:
      
      The Makefiles were reorganized in the "rmk/restart" series and modified
      in the "samsung/cleanup series". This also pulls in the other conflict
      resolutions from the restart series against the samsung/dt series.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      a07613a5
    • Paul Gortmaker's avatar
      ext2/3/4: delete unneeded includes of module.h · 302bf2f3
      Paul Gortmaker authored
      Delete any instances of include module.h that were not strictly
      required.  In the case of ext2, the declaration of MODULE_LICENSE
      etc. were in inode.c but the module_init/exit were in super.c, so
      relocate the MODULE_LICENCE/AUTHOR block to super.c which makes it
      consistent with ext3 and ext4 at the same time.
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      302bf2f3
    • Djalal Harouni's avatar
      ext{3,4}: Fix potential race when setversion ioctl updates inode · 6c2155b9
      Djalal Harouni authored
      The EXT{3,4}_IOC_SETVERSION ioctl() updates i_ctime and i_generation
      without i_mutex. This can lead to a race with the other operations that
      update i_ctime. This is not a big issue but let's make the ioctl consistent
      with how we handle e.g. other timestamp updates and use i_mutex to protect
      inode changes.
      Signed-off-by: default avatarDjalal Harouni <tixxdz@opendz.org>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      6c2155b9
    • Jan Kara's avatar
      udf: Mark LVID buffer as uptodate before marking it dirty · 853a0c25
      Jan Kara authored
      When we hit EIO while writing LVID, the buffer uptodate bit is cleared.
      This then results in an anoying warning from mark_buffer_dirty() when we
      write the buffer again. So just set uptodate flag unconditionally.
      Reviewed-by: default avatarNamjae Jeon <linkinjeon@gmail.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      853a0c25
    • Jan Kara's avatar
      ext3: Don't warn from writepage when readonly inode is spotted after error · 33c104d4
      Jan Kara authored
      WARN_ON_ONCE(IS_RDONLY(inode)) tends to trip when filesystem hits error and is
      remounted read-only. This unnecessarily scares users (well, they should be
      scared because of filesystem error, but the stack trace distracts them from the
      right source of their fear ;-). We could as well just remove the WARN_ON but
      it's not hard to fix it to not trip on filesystem with errors and not use more
      cycles in the common case so that's what we do.
      
      CC: stable@kernel.org
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      33c104d4
    • Jan Kara's avatar
      jbd: Remove j_barrier mutex · 00482785
      Jan Kara authored
      j_barrier mutex is used for serializing different journal lock operations.  The
      problem with it is that e.g. FIFREEZE ioctl results in process leaving kernel
      with j_barrier mutex held which makes lockdep freak out. Also hibernation code
      wants to freeze filesystem but it cannot do so because it then cannot hibernate
      the system because of mutex being locked.
      
      So we remove j_barrier mutex and use direct wait on j_barrier_count instead.
      Since locking journal is a rare operation we don't have to care about fairness
      or such things.
      
      CC: Andrew Morton <akpm@linux-foundation.org>
      Acked-by: default avatarJoel Becker <jlbec@evilplan.org>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      00482785
    • Jeff Mahoney's avatar
      reiserfs: Force inode evictions before umount to avoid crash · a9e36da6
      Jeff Mahoney authored
      This patch fixes a crash in reiserfs_delete_xattrs during umount.
      
      When shrink_dcache_for_umount clears the dcache from
      generic_shutdown_super, delayed evictions are forced to disk. If an
      evicted inode has extended attributes associated with it, it will
      need to walk the xattr tree to locate and remove them.
      
      But since shrink_dcache_for_umount will BUG if it encounters active
      dentries, the xattr tree must be released before it's called or it will
      crash during every umount.
      
      This patch forces the evictions to occur before generic_shutdown_super
      by calling shrink_dcache_sb first. The additional evictions caused
      by the removal of each associated xattr file and dir will be automatically
      handled as they're added to the LRU list.
      
      CC: reiserfs-devel@vger.kernel.org
      CC: stable@kernel.org
      Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      a9e36da6
    • Jan Kara's avatar
      reiserfs: Fix quota mount option parsing · a06d789b
      Jan Kara authored
      When jqfmt mount option is not specified on remount, we mistakenly clear
      s_jquota_fmt value stored in superblock. Fix the problem.
      
      CC: stable@kernel.org
      CC: reiserfs-devel@vger.kernel.org
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      a06d789b
    • Jan Kara's avatar
      udf: Treat symlink component of type 2 as / · fef2e9f3
      Jan Kara authored
      Currently, we ignore symlink component of type 2. But mkisofs and other OS'
      seem to treat it as / so do the same for compatibility.
      Reported-by: default avatar"Gábor S." <otnaccess@hotmail.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      fef2e9f3
    • Jan Kara's avatar
      udf: Fix deadlock when converting file from in-ICB one to normal one · d2eb8c35
      Jan Kara authored
      During BKL removal in 2.6.38, conversion of files from in-ICB format to normal
      format got broken. We call ->writepage with i_data_sem held but udf_get_block()
      also acquires i_data_sem thus creating A-A deadlock.
      
      We fix the problem by dropping i_data_sem before calling ->writepage() which is
      safe since i_mutex still protects us against any changes in the file. Also fix
      pagelock - i_data_sem lock inversion in udf_expand_file_adinicb() by dropping
      i_data_sem before calling find_or_create_page().
      
      CC: stable@kernel.org
      Reported-by: default avatarMatthias Matiak <netzpython@mail-on.us>
      Tested-by: default avatarMatthias Matiak <netzpython@mail-on.us>
      Reviewed-by: default avatarNamjae Jeon <linkinjeon@gmail.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      d2eb8c35
    • Jan Kara's avatar
      udf: Cleanup calling convention of inode_getblk() · 7b0b0933
      Jan Kara authored
      inode_getblk() always returned NULL and passed results in its parameters.
      Make the function return something useful - found block number.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      7b0b0933
    • Jan Kara's avatar
      ext2: Fix error handling on inode bitmap corruption · ef6919c2
      Jan Kara authored
      When insert_inode_locked() fails in ext2_new_inode() it most likely means inode
      bitmap got corrupted and we allocated again inode which is already in use. Also
      doing unlock_new_inode() during error recovery is wrong since the inode does
      not have I_NEW set. Fix the problem by informing about filesystem error and
      jumping to fail: (instead of fail_drop:) which doesn't call unlock_new_inode().
      Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      ef6919c2
    • Jan Kara's avatar
      ext3: Fix error handling on inode bitmap corruption · 1415dd87
      Jan Kara authored
      When insert_inode_locked() fails in ext3_new_inode() it most likely
      means inode bitmap got corrupted and we allocated again inode which
      is already in use. Also doing unlock_new_inode() during error recovery
      is wrong since inode does not have I_NEW set. Fix the problem by jumping
      to fail: (instead of fail_drop:) which declares filesystem error and
      does not call unlock_new_inode().
      Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      1415dd87
    • Zheng Liu's avatar
      ext3: replace ll_rw_block with other functions · d03e1292
      Zheng Liu authored
      ll_rw_block() is deprecated. Thus we replace it with other functions.
      
      CC: Jan Kara <jack@suse.cz>
      Signed-off-by: default avatarZheng Liu <wenqing.lz@taobao.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      d03e1292
    • Al Viro's avatar
      ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink() · 0ce8c010
      Al Viro authored
      Both ext3 and ext4 put the half-created symlink inode into the orphan list
      for a while (see the comment in ext[34]_symlink() for gory details).  Then,
      if everything went fine, they pull it out of the orphan list and bump the
      link count back to 1.  The thing is, inc_nlink() is going to complain about
      seeing somebody changing i_nlink from 0 to 1.  With a good reason, since
      normally something like that is a bug.  Explicit set_nlink(inode, 1) does
      the same thing as inc_nlink() here, but it does *not* complain - exactly
      because it should be usable in strange situations like this one.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      0ce8c010