Eric Lee / smarc-fsl-linux-kernel

15 Sep, 2011

18 commits

24 Aug, 2011

1 commit

23 Aug, 2011

1 commit

10 Aug, 2011

1 commit

09 Aug, 2011

1 commit

05 Aug, 2011

1 commit

04 Aug, 2011

1 commit

26 Jul, 2011

16 commits

  • 10bd2473b   eventpoll: fix comment typo 'evenpoll' ... Browse Code »

    Signed-off-by: Paul Bolle
    Signed-off-by: Jiri Kosina

    Paul Bolle
     
  • e08dc1325   p9: avoid unused variable warning ... Browse Code »

    Commit 4e34e719e457 ("fs: take the ACL checks to common code") removed
    the use of the 'acl' variable in v9fs_iop_get_acl(), but left the
    variable definition around. Remove it to get rid of the warning:

    fs/9p/acl.c: In function ‘v9fs_iop_get_acl’:
    fs/9p/acl.c:101:20: warning: unused variable ‘acl’

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • 138051659   Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... Browse Code »

    * '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
     
  • d5ef64235   Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 ... Browse Code »

    * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (26 commits)
    amba pl011: workaround for uart registers lockup
    n_gsm: fix the wrong FCS handling
    pch_uart: add missing comment about OKI ML7223
    pch_uart: Add MSI support
    tty: fix "IRQ45: nobody cared"
    PTI feature to allow user to name and mark masterchannel request.
    0 for o PTI Makefile bug.
    tty: serial: samsung.c remove legacy PM code.
    SERIAL: SC26xx: Fix link error.
    serial: mrst_max3110: initialize waitqueue earlier
    mrst_max3110: Change max missing message priority.
    tty: s5pv210: Add delay loop on fifo reset function for UART
    tty/serial: Fix XSCALE serial ports, e.g. ce4100
    serial: bfin_5xx: fix off-by-one with resource size
    drivers/tty: use printk_ratelimited() instead of printk_ratelimit()
    tty: n_gsm: Added refcount usage to gsm_mux and gsm_dlci structs
    tty: n_gsm: Add raw-ip support
    tty: n_gsm: expose gsmtty device nodes at ldisc open time
    pch_phub: Fix register miss-setting issue
    serial: 8250, increase PASS_LIMIT
    ...

    Linus Torvalds
     
  • f549953c1   Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 ... Browse Code »

    * '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
     
  • f0deb97ab   Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git… ... Browse Code »

    …/gregkh/driver-core-2.6

    * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
    updated Documentation/ja_JP/SubmittingPatches
    debugfs: add documentation for debugfs_create_x64
    uio: uio_pdrv_genirq: Add OF support
    firmware: gsmi: remove sysfs entries when unload the module
    Documentation/zh_CN: Fix messy code file email-clients.txt
    driver core: add more help description for "path to uevent helper"
    driver-core: modify FIRMWARE_IN_KERNEL help message
    driver-core: Kconfig grammar corrections in firmware configuration
    DOCUMENTATION: Replace create_device() with device_create().
    DOCUMENTATION: Update overview.txt in Doc/driver-model.
    pti: pti_tty_install documentation mispelling.

    Linus Torvalds
     
  • 184475029   Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Browse Code »

    * '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
     
  • 3b76eefe0   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu ... Browse Code »

    * '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
     
  • 91d44d999   Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
    Squashfs: Make ZLIB compression support optional
    Squashfs: Update documentation for XZ and add squashfs-tools devel tree

    Linus Torvalds
     
  • 2dad3206d   Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux ... Browse Code »

    * '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
     
  • 84635d68b   vfs: fix check_acl compile error when CONFIG_FS_POSIX_ACL is not set ... Browse Code »

    Commit e77819e57f08 ("vfs: move ACL cache lookup into generic code")
    didn't take the FS_POSIX_ACL config variable into account - when that is
    not set, ACL's go away, and the cache helper functions do not exist,
    causing compile errors like

    fs/namei.c: In function 'check_acl':
    fs/namei.c:191:10: error: implicit declaration of function 'negative_cached_acl'
    fs/namei.c:196:2: error: implicit declaration of function 'get_cached_acl'
    fs/namei.c:196:6: warning: assignment makes pointer from integer without a cast
    fs/namei.c:212:11: error: implicit declaration of function 'set_cached_acl'

    Reported-by: Markus Trippelsdorf
    Acked-by: Stephen Rothwell
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • 45b583b10   Merge 'akpm' patch series ... Browse Code »

    * 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
     
  • f19da2ce8   drivers/connector/cn_proc.c: remove unused local ... Browse Code »

    Fix the warning

    drivers/connector/cn_proc.c: In function 'proc_ptrace_connector':
    drivers/connector/cn_proc.c:176: warning: unused variable 'tracer'

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

    Andrew Morton
     
  • df2694d80   Documentation/SubmitChecklist: add RCU debug config options ... Browse Code »

    There have been persistent lockdep RCU splats, indicating that submitters
    are not testing with CONFIG_PROVE_RCU. Add this config option to the list
    in Documentation/SubmitChecklist. Also add CONFIG_DEBUG_OBJECTS_RCU_HEAD
    for good measure.

    Signed-off-by: Paul E. McKenney
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul E. McKenney
     
  • 9d6bf5aa1   reiserfs: use hweight_long() ... Browse Code »

    Use hweight_long() to count free bits in the bitmap.

    Signed-off-by: Akinobu Mita
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • 0c2fd1bfb   reiserfs: use proper little-endian bitops ... Browse Code »

    Using __test_and_{set,clear}_bit_le() with ignoring its return value can
    be replaced with __{set,clear}_bit_le().

    This introduces reiserfs_{set,clear}_le_bit for __{set,clear}_bit_le and
    does the above change with them.

    Signed-off-by: Akinobu Mita
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita