28 Jul, 2011

2 commits

  • Should have been done in commit 1af08a1407f4 ("This is in preparation
    for more generic atomic").

    Signed-off-by: Stephen Rothwell
    Cc: Arun Sharma
    Cc: David Miller
    Cc: "Hans-Christian Egtvedt"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stephen Rothwell
     
  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: Do not show error message for 32 interrupt lines
    Revert "microblaze: PCI fix typo fault in of_node pointer moving into pci_bus"
    microblaze: PCI fix typo fault in of_node pointer moving into pci_bus
    microblaze: Add support for early console on mdm
    microblaze: Simplify early console binding from DT
    microblaze: Get early printk console earlier
    microblaze: Standardise cpuinfo output for cache policy
    microblaze: Unprivileged stream instruction awareness
    microblaze: trivial: Fix typo fault
    microblaze: exec: Remove redundant set_fs(USER_DS)
    microblaze: Remove duplicated prototype of start_thread()
    microblaze: Fix unaligned value saving to the stack for system with MMU
    microblaze/irqs: Do not trace arch_local_{*,irq_*} functions

    Linus Torvalds
     

27 Jul, 2011

17 commits

  • When interrupt controller uses 32 interrupts lines the kernel
    show error message about mismatch in kind-of-intr parameter
    because it exceeds u32. Recast fixs this issue.

    Signed-off-by: Michal Simek

    Michal Simek
     
  • * 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (47 commits)
    OMAP: Add debugfs node to show the summary of all clocks
    OMAP2+: hwmod: Follow the recommended PRCM module enable sequence
    OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code
    OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programming
    OMAP2+: PM: idle clkdms only if already in idle
    OMAP2+: clockdomain: add clkdm_in_hwsup()
    OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod framework
    OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()
    OMAP4: hwmod: Introduce the module control in hwmod control
    OMAP4: cm: Add two new APIs for modulemode control
    OMAP4: hwmod data: Add modulemode entry in omap_hwmod structure
    OMAP4: hwmod data: Add PRM context register offset
    OMAP4: prm: Remove deprecated functions
    OMAP4: prm: Replace warm reset API with the offset based version
    OMAP4: hwmod: Replace RSTCTRL absolute address with offset macros
    OMAP: hwmod: Wait the idle status to be disabled
    OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
    OMAP2+: hwmod: Init clkdm field at boot time
    OMAP4: hwmod data: Add clock domain attribute
    OMAP4: clock data: Add missing divider selection for auxclks
    ...

    Linus Torvalds
     
  • * 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
    ARM: S5P64X0: External Interrupt Support
    ARM: EXYNOS4: Enable MFC on Samsung NURI
    ARM: EXYNOS4: Enable MFC on universal_c210
    ARM: S5PV210: Enable MFC on Goni
    ARM: S5P: Add support for MFC device
    ARM: EXYNOS4: Add support FIMD on SMDKC210
    ARM: EXYNOS4: Add platform device and helper functions for FIMD
    ARM: EXYNOS4: Add resource definition for FIMD
    ARM: EXYNOS4: Change devname for FIMD clkdev
    ARM: SAMSUNG: Add IRQ_I2S0 definition
    ARM: SAMSUNG: Add platform device for idma
    ARM: EXYNOS4: Add more registers to be saved and restored for PM
    ARM: EXYNOS4: Add more register addresses of CMU
    ARM: EXYNOS4: Add platform device for dwmci driver
    ARM: EXYNOS4: configure rtc-s3c on NURI
    ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
    ARM: EXYNOS4: configure ADC on NURI
    ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
    ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
    ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
    ...

    Fix up tons of silly conflicts:
    - arch/arm/mach-davinci/include/mach/psc.h
    - arch/arm/mach-exynos4/Kconfig
    - arch/arm/mach-exynos4/mach-smdkc210.c
    - arch/arm/mach-exynos4/pm.c
    - arch/arm/mach-imx/mm-imx1.c
    - arch/arm/mach-imx/mm-imx21.c
    - arch/arm/mach-imx/mm-imx25.c
    - arch/arm/mach-imx/mm-imx27.c
    - arch/arm/mach-imx/mm-imx31.c
    - arch/arm/mach-imx/mm-imx35.c
    - arch/arm/mach-mx5/mm.c
    - arch/arm/mach-s5pv210/mach-goni.c
    - arch/arm/mm/Kconfig

    Linus Torvalds
     
  • * 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    ARM: S3C64XX: Configure backup battery charger on Cragganmore
    ARM: S3C64XX: Fix WM8915 IRQ polarity on Cragganmore
    ARM: S3C64XX: Configure supplies for all Cragganmore regulators
    ARM: S3C64XX: Refresh Cragganmore support
    ARM: S3C64XX: Initial support for Wolfson/Simtec Cragganmore/Banff
    OMAP4: Keyboard: Mux changes in the board file
    omap: blaze: add mmc5/wl1283 device support
    omap: 4430SDP: Register the card detect GPIO properly
    arm: omap3: cm-t35: add support for cm-t3730
    OMAP3: beagle: add support for beagleboard xM revision C
    OMAP3: rx-51: Add full regulator definitions
    omap: rx51: Platform support for lp5523 led chip

    Linus Torvalds
     
  • …git/arm/linux-arm-soc

    * 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    ARM: Consolidate the clkdev header files
    ARM: set vga memory base at run-time
    ARM: convert PCI defines to variables
    ARM: pci: make pcibios_assign_all_busses use pci_has_flag
    ARM: remove unnecessary mach/hardware.h includes
    pci: move microblaze and powerpc pci flag functions into asm-generic
    powerpc: rename ppc_pci_*_flags to pci_*_flags

    Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h

    Linus Torvalds
     
  • * 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (24 commits)
    ASoC: omap: McBSP: fix build breakage on OMAP1
    OMAP: hwmod: fix the i2c-reset timeout during bootup
    I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr
    I2C: OMAP2+: Tag all OMAP2+ hwmod defintions with I2C IP revision
    I2C: OMAP1/OMAP2+: create omap I2C functionality flags for each cpu_... test
    I2C: OMAP2+: Introduce I2C IP versioning constants
    I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32
    I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c
    OMAP4: hwmod data: Change DSS main_clk scheme
    OMAP4: powerdomain data: Remove unsupported MPU powerdomain state
    OMAP4: clock data: Keep GPMC clocks always enabled and hardware managed
    OMAP4: powerdomain data: Fix core mem states and missing cefuse flag
    OMAP2+: PM: Initialise sleep_switch to a non-valid value
    OMAP4: hwmod data: Modify DSS opt clocks
    OMAP4: iommu: fix clock name
    omap: iovmm: s/sg_dma_len(sg)/sg->length/
    omap: iommu: fix pte programming
    arm: omap3: cm-t35: fix slow path warning
    arm: omap3: cm-t35: minor comments fixes
    omap: ZOOM: QUART: Request reset GPIO
    ...

    Linus Torvalds
     
  • * 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    MAINTAINERS: add maintainer of CSR SiRFprimaII machine
    ARM: CSR: initializing L2 cache
    ARM: CSR: mapping early DEBUG_LL uart
    ARM: CSR: Adding CSR SiRFprimaII board support
    OMAP4: clocks: Update the clock tree with 4460 clock nodes
    OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts
    OMAP4: ID: add omap_has_feature for max freq supported
    OMAP: ID: introduce chip detection for OMAP4460
    ARM: Xilinx: merge board file into main platform code
    ARM: Xilinx: Adding Xilinx board support

    Fix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h

    Linus Torvalds
     
  • After changing all consumers of atomics to include , we
    ran into some compile time errors due to this dependency chain:

    linux/atomic.h
    -> asm/atomic.h
    -> asm-generic/atomic-long.h

    where atomic-long.h could use funcs defined later in linux/atomic.h
    without a prototype. This patches moves the code that includes
    asm-generic/atomic*.h to linux/atomic.h.

    Archs that need need to select
    CONFIG_GENERIC_ATOMIC64 from now on (some of them used to include it
    unconditionally).

    Compile tested on i386 and x86_64 with allnoconfig.

    Signed-off-by: Arun Sharma
    Cc: Eric Dumazet
    Cc: Ingo Molnar
    Cc: David Miller
    Acked-by: Mike Frysinger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arun Sharma
     
  • This is in preparation for more generic atomic primitives based on
    __atomic_add_unless.

    Signed-off-by: Arun Sharma
    Signed-off-by: Hans-Christian Egtvedt
    Reviewed-by: Eric Dumazet
    Cc: Ingo Molnar
    Cc: David Miller
    Acked-by: Mike Frysinger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arun Sharma
     
  • This allows us to move duplicated code in
    (atomic_inc_not_zero() for now) to

    Signed-off-by: Arun Sharma
    Reviewed-by: Eric Dumazet
    Cc: Ingo Molnar
    Cc: David Miller
    Cc: Eric Dumazet
    Acked-by: Mike Frysinger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arun Sharma
     
  • The majority of architectures implement ext2 atomic bitops as
    test_and_{set,clear}_bit() without spinlock.

    This adds this type of generic implementation in ext2-atomic-setbit.h and
    use it wherever possible.

    Signed-off-by: Akinobu Mita
    Suggested-by: Andreas Dilger
    Suggested-by: Arnd Bergmann
    Acked-by: Arnd Bergmann
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • Harmonise these return values with other architectures. In some cases
    this affects all compilers and in other cases non-gcc compilers only.

    Cc: Yoshinori Sato
    Cc: Geert Uytterhoeven
    Cc: Chris Zankel
    Cc: Ulrich Drepper
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • [ poleg@redhat.com: no need to declare show_regs() in ptrace.h, sched.h does this ]
    Signed-off-by: Mike Frysinger
    Cc: Tejun Heo
    Signed-off-by: Oleg Nesterov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mike Frysinger
     
  • The address limit is already set in flush_old_exec() so this
    set_fs(USER_DS) is redundant.

    Signed-off-by: Mathias Krause
    Cc: Koichi Yasutake
    Acked-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mathias Krause
     
  • The address limit is already set in flush_old_exec() so those calls to
    set_fs(USER_DS) are redundant.

    Also removed the dead code in flush_thread().

    Signed-off-by: Mathias Krause
    Acked-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Mathias Krause
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (31 commits)
    MIPS: Close races in TLB modify handlers.
    MIPS: Add uasm UASM_i_SRL_SAFE macro.
    MIPS: RB532: Use hex_to_bin()
    MIPS: Enable cpu_has_clo_clz for MIPS Technologies' platforms
    MIPS: PowerTV: Provide cpu-feature-overrides.h
    MIPS: Remove pointless return statement from empty void functions.
    MIPS: Limit fixrange_init() to the FIXMAP region
    MIPS: Install handlers for software IRQs
    MIPS: Move FIXADDR_TOP into spaces.h
    MIPS: Add SYNC after cacheflush
    MIPS: pfn_valid() is broken on low memory HIGHMEM systems
    MIPS: HIGHMEM DMA on noncoherent MIPS32 processors
    MIPS: topdown mmap support
    MIPS: Remove redundant addr_limit assignment on exec.
    MIPS: AR7: Replace __attribute__((__packed__)) with __packed
    MIPS: AR7: Remove 'space before tabs' in platform.c
    MIPS: Lantiq: Add missing clk_enable and clk_disable functions.
    MIPS: AR7: Fix trailing semicolon bug in clock.c
    MAINTAINERS: Update MIPS entry.
    MIPS: BCM63xx: Remove duplicate PERF_IRQSTAT_REG definition
    ...

    Linus Torvalds
     
  • * 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, olpc-xo15-sci: Enable EC wakeup capability
    x86, olpc: Fix dependency on POWER_SUPPLY
    x86, olpc: Add XO-1.5 SCI driver
    x86, olpc: Add XO-1 RTC driver
    x86, olpc-xo1-sci: Propagate power supply/battery events
    x86, olpc-xo1-sci: Add lid switch functionality
    x86, olpc-xo1-sci: Add GPE handler and ebook switch functionality
    x86, olpc: EC SCI wakeup mask functionality
    x86, olpc: Add XO-1 SCI driver and power button control
    x86, olpc: Add XO-1 suspend/resume support
    x86, olpc: Rename olpc-xo1 to olpc-xo1-pm
    x86, olpc: Move CS5536-related constants to cs5535.h
    x86, olpc: Add missing elements to device tree

    Linus Torvalds
     

26 Jul, 2011

21 commits

  • This reverts commit c9d761b7c4b658a937a941aea2781f511a0ff3ec.

    Ben' commit "microblaze/pci: Move the remains of pci_32.c to pci-common.c"
    (sha1: bf13a6fa09b8db7f1fd59b5e2ed3674a89a6a25c)
    completely removed pci_32.c that's why my fixing commit caused
    the problem with merging and need to be revert.

    Signed-off-by: Michal Simek

    Michal Simek
     
  • * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
    staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
    staging:iio:kfifo_buf fix double initialization of the ring device structure.
    staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
    staging:iio:imu fix missing register table index for some channels
    spectra: enable device before poking it
    staging: rts_pstor: Fix a miswriting
    staging/lirc_bt829: Return -ENODEV when no hardware is found.
    staging/lirc_parallel: remove pointless prototypes.
    staging/lirc_parallel: fix panic on rmmod
    staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
    Staging: zram: Fix kunmapping order
    Revert "gma500: Fix dependencies"
    gma500: Add medfield header
    gma500: wire up the mrst i2c bus from chip_info
    gma500: Fix DPU build
    gma500: Clean up the DPU config and make it runtime
    gma500: resync with Medfield progress
    gma500: Use the mrst helpers and power control for mode commit
    gma500@ Fix backlight range error
    gma500: More Moorestown muddle meddling means MM maybe might modeset
    ...

    Fix up fairly trivial conflicts all over, mostly due to header file
    cleanup conflicts, but some deleted files and some just context changes:
    - Documentation/feature-removal-schedule.txt
    - drivers/staging/bcm/headers.h
    - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
    - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
    - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
    - drivers/staging/brcm80211/brcmfmac/wl_iw.c
    - drivers/staging/et131x/et131x_netdev.c
    - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
    - drivers/staging/rtl8192e/r8192E.h
    - drivers/staging/usbip/userspace/src/utils.h

    Linus Torvalds
     
  • * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (115 commits)
    EHCI: fix direction handling for interrupt data toggles
    USB: serial: add IDs for WinChipHead USB->RS232 adapter
    USB: OHCI: fix another regression for NVIDIA controllers
    usb: gadget: m66592-udc: add pullup function
    usb: gadget: m66592-udc: add function for external controller
    usb: gadget: r8a66597-udc: add pullup function
    usb: renesas_usbhs: support multi driver
    usb: renesas_usbhs: inaccessible pipe is not an error
    usb: renesas_usbhs: care buff alignment when dma handler
    USB: PL2303: correctly handle baudrates above 115200
    usb: r8a66597-hcd: fixup USB_PORT_STAT_C_SUSPEND shift
    usb: renesas_usbhs: compile/config are rescued
    usb: renesas_usbhs: fixup comment-out
    usb: update email address in ohci-sh and r8a66597-hcd
    usb: r8a66597-hcd: add function for external controller
    EHCI: only power off port if over-current is active
    USB: mon: Allow to use usbmon without debugfs
    USB: EHCI: go back to using the system clock for QH unlinks
    ehci: add pci quirk for Ordissimo and RM Slate 100 too
    ehci: refactor pci quirk to use standard dmi_check_system method
    ...

    Fix up trivial conflicts in Documentation/feature-removal-schedule.txt

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (99 commits)
    drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
    powerpc/85xx: fix mpic configuration in CAMP mode
    powerpc: Copy back TIF flags on return from softirq stack
    powerpc/64: Make server perfmon only built on ppc64 server devices
    powerpc/pseries: Fix hvc_vio.c build due to recent changes
    powerpc: Exporting boot_cpuid_phys
    powerpc: Add CFAR to oops output
    hvc_console: Add kdb support
    powerpc/pseries: Fix hvterm_raw_get_chars to accept < 16 chars, fixing xmon
    powerpc/irq: Quieten irq mapping printks
    powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
    powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
    powerpc: Disable IRQs off tracer in ppc64 defconfig
    powerpc: Sync pseries and ppc64 defconfigs
    powerpc/pseries/hvconsole: Fix dropped console output
    hvc_console: Improve tty/console put_chars handling
    powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
    powerpc/mm: Fix output of total_ram.
    powerpc/cpufreq: Add cpufreq driver for Momentum Maple boards
    powerpc: Correct annotations of pmu registration functions
    ...

    Fix up trivial Kconfig/Makefile conflicts in arch/powerpc, drivers, and
    drivers/cpufreq

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68k: Revive reporting of spurious interrupts
    m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
    m68k: fix some atomic operation asm address modes for ColdFire
    m68k: use CPU_HAS_NO_BITFIELDS for signal functions
    m68k: merge and clean up delay.h files
    m68knommu: correctly use trap_init
    m68knommu: merge ColdFire 5206 and 5206e platform code
    m68k: merge mmu and non-mmu bitops.h
    m68k: merge MMU and non MMU versions of system.h
    m68k: merge MMU and non-MMU versions of asm/hardirq.h
    m68k: merge the non-mmu and mmu versions of module.c
    m68knommu: Fix printk() format in free_initrd_mem()
    m68knommu: Make empty_zero_page "void *", like on m68k

    Linus Torvalds
     
  • * 'for-3.1' of git://linux-nfs.org/~bfields/linux:
    nfsd: don't break lease on CLAIM_DELEGATE_CUR
    locks: rename lock-manager ops
    nfsd4: update nfsv4.1 implementation notes
    nfsd: turn on reply cache for NFSv4
    nfsd4: call nfsd4_release_compoundargs from pc_release
    nfsd41: Deny new lock before RECLAIM_COMPLETE done
    fs: locks: remove init_once
    nfsd41: check the size of request
    nfsd41: error out when client sets maxreq_sz or maxresp_sz too small
    nfsd4: fix file leak on open_downgrade
    nfsd4: remember to put RW access on stateid destruction
    NFSD: Added TEST_STATEID operation
    NFSD: added FREE_STATEID operation
    svcrpc: fix list-corrupting race on nfsd shutdown
    rpc: allow autoloading of gss mechanisms
    svcauth_unix.c: quiet sparse noise
    svcsock.c: include sunrpc.h to quiet sparse noise
    nfsd: Remove deprecated nfsctl system call and related code.
    NFSD: allow OP_DESTROY_CLIENTID to be only op in COMPOUND

    Fix up trivial conflicts in Documentation/feature-removal-schedule.txt

    Linus Torvalds
     
  • Page table entries are made invalid by writing a zero into the the PTE
    slot in a page table. This creates a race condition with the TLB
    modify handlers when they are updating the PTE.

    CPU0 CPU1

    Test for _PAGE_PRESENT
    . set to not _PAGE_PRESENT (zero)
    Set to _PAGE_VALID

    So now the page not present value (zero) is suddenly valid and user
    space programs have access to physical page zero.

    We close the race by putting the test for _PAGE_PRESENT and setting of
    _PAGE_VALID into an atomic LL/SC section. This requires more registers
    than just K0 and K1 in the handlers, so we need to save some registers
    to a save area and then restore them when we are done.

    The save area is an array of cacheline aligned structures that should
    not suffer cache line bouncing as they are CPU private.

    [ralf@linux-mips.org: Fix !defined(CONFIG_MIPS_PGD_C0_CONTEXT) build error.]

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2577/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • This can be used from either 32-bit or 64-bit code to generate logical
    right shifts of any constant amount.

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2576/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • * Merge akpm patch series: (122 commits)
    drivers/connector/cn_proc.c: remove unused local
    Documentation/SubmitChecklist: add RCU debug config options
    reiserfs: use hweight_long()
    reiserfs: use proper little-endian bitops
    pnpacpi: register disabled resources
    drivers/rtc/rtc-tegra.c: properly initialize spinlock
    drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
    drivers/rtc: add support for Qualcomm PMIC8xxx RTC
    drivers/rtc/rtc-s3c.c: support clock gating
    drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
    init: skip calibration delay if previously done
    misc/eeprom: add eeprom access driver for digsy_mtc board
    misc/eeprom: add driver for microwire 93xx46 EEPROMs
    checkpatch.pl: update $logFunctions
    checkpatch: make utf-8 test --strict
    checkpatch.pl: add ability to ignore various messages
    checkpatch: add a "prefer __aligned" check
    checkpatch: validate signature styles and To: and Cc: lines
    checkpatch: add __rcu as a sparse modifier
    checkpatch: suggest using min_t or max_t
    ...

    Did this as a merge because of (trivial) conflicts in
    - Documentation/feature-removal-schedule.txt
    - arch/xtensa/include/asm/uaccess.h
    that were just easier to fix up in the merge than in the patch series.

    Linus Torvalds
     
  • From: Shreshtha Kumar Sahu

    platform data for simple backlight driver for LM3530
    in the u5500 platform

    Signed-off-by: Shreshtha Kumar Sahu
    Signed-off-by: Linus Walleij
    Cc: Richard Purdie
    Cc: Lee Jones
    Cc: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Linus Walleij
     
  • It is not necessary to share the same notifier.h.

    This patch already moves register_reboot_notifier() and
    unregister_reboot_notifier() from kernel/notifier.c to kernel/sys.c.

    [amwang@redhat.com: make allyesconfig succeed on ppc64]
    Signed-off-by: WANG Cong
    Cc: David Miller
    Cc: "Rafael J. Wysocki"
    Cc: Greg KH
    Signed-off-by: WANG Cong
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Amerigo Wang
     
  • GCC 4.6's -Wunused-but-set-variable found some dead code.

    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • Linux can have pids up to 4*1024*1024. To handle such huge numbers
    pid_buf needs to be larger.

    Reported-by: Geert Uytterhoeven
    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • Until now UML had no x86_64 vDSO. So glibc always used the vsyscall page
    for gettimeday() and friends. Calls to gettimeday() returned falsely the
    host time and confused some programs.

    This patch adds a vDSO which turns all __vdso_* calls into a system call
    so that UML can trap them.

    As glibc still uses the vsyscall page for static binaries this patch
    improves the situation only for dynamic binaries.

    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • Implement arch_vma_name() and make get_gate_vma(), in_gate_area() and
    in_gate_area_no_mm() a nop.

    We need arch_vma_name() to support vDSO.

    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • When UML is unable to reuse the host's vDSO FIXADDR_USER_START is zero.
    To handle this special case correclty we have to implement custom gate
    area helper methods.

    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • Reusing the host's vDSO makes only sense on x86_32.

    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • When creating the temp file there's a memory and file descriptor leak upon
    error.

    Signed-off-by: Davidlohr Bueso
    Signed-off-by: Richard Weinberger
    Reviewed-by: Vitaliy Ivanov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Davidlohr Bueso
     
  • Do not free memory when you failed to allocate it.

    Signed-off-by: Vitaliy Ivanov
    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Vitaliy Ivanov
     
  • Fix this warning:

    arch/um/os-Linux/helper.c: In function `helper_child':
    arch/um/os-Linux/helper.c:38:7: warning: ignoring return value of `write', declared with attribute warn_unused_result

    [richard@nod.at: happens only with -D_FORTIFY_SOURCE=2]
    Signed-off-by: Vitaliy Ivanov
    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Vitaliy Ivanov
     
  • Fix this warning:

    arch/um/drivers/cow_user.c: In function `absolutize':
    arch/um/drivers/cow_user.c:189:7: warning: ignoring return value of `chdir', declared with attribute warn_unused_result

    [richard@nod.at: happens only with -D_FORTIFY_SOURCE=2]
    Signed-off-by: Vitaliy Ivanov
    Signed-off-by: Richard Weinberger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Vitaliy Ivanov