1. 18 3月, 2011 17 次提交
  2. 17 3月, 2011 23 次提交
    • L
      Merge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 054cfaac
      Linus Torvalds 提交于
      * 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        vfs: bury ->get_sb()
        nfs: switch NFS from ->get_sb() to ->mount()
        nfs: stop mangling ->mnt_devname on NFS
        vfs: new superblock methods to override /proc/*/mount{s,info}
        nfs: nfs_do_{ref,sub}mount() superblock argument is redundant
        nfs: make nfs_path() work without vfsmount
        nfs: store devname at disconnected NFS roots
        nfs: propagate devname to nfs{,4}_get_root()
      054cfaac
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · dc113c1f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast
        m68k/atari: ARAnyM - Add support for network access
        m68k/atari: ARAnyM - Add support for console access
        m68k/atari: ARAnyM - Add support for block access
        m68k/atari: Initial ARAnyM support
        m68k: Kconfig - Remove unneeded "default n"
        m68k: Makefiles - Change to new flags variables
        m68k/amiga: Reclaim Chip RAM for PPC exception handlers
        m68k: Allow all kernel traps to be handled via exception fixups
        m68k: Use base_trap_init() to initialize vectors
        m68k: Add helper function handle_kernel_fault()
      dc113c1f
    • L
      Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm · 63a93699
      Linus Torvalds 提交于
      * 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: 6629/2: aaec2000: remove support for mach-aaec2000
        ARM: lh7a40x: remove unmaintained platform support
      
      Fix up trivial conflicts in
       - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
       - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)
      63a93699
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 16d87757
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (91 commits)
        ARM: 6806/1: irq: introduce entry and exit functions for chained handlers
        ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas
        ARM: 6747/1: P2V: Thumb2 support
        ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
        ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode
        ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9
        ARM: 6772/1: errata: possible fault MMU translations following an ASID switch
        ARM: 6776/1: mach-ux500: activate fix for errata 753970
        ARM: 6794/1: SPEAr: Append UL to device address macros.
        ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files
        ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
        ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code
        ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
        ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci
        ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
        ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
        ARM: 6681/1: SPEAr: add debugfs support to clk API
        ARM: 6703/1: SPEAr: update clk API support
        ARM: 6679/1: SPEAr: make clk API functions more generic
        ARM: 6737/1: SPEAr: formalized timer support
        ...
      16d87757
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · e3455133
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits)
        m68knommu: external interrupt support to ColdFire intc-simr controller
        m68knommu: external interrupt support to ColdFire intc-2 controller
        m68knommu: remove ColdFire CLOCK_DIV config option
        m68knommu: fix gpio warnings for ColdFire 5407 targets
        m68knommu: fix gpio warnings for ColdFire 532x targets
        m68knommu: fix gpio warnings for ColdFire 5307 targets
        m68knommu: fix gpio warnings for ColdFire 527x targets
        m68knommu: fix gpio warnings for ColdFire 5272 targets
        m68knommu: fix gpio warnings for ColdFire 5249 targets
        m68knommu: fix gpio warnings for ColdFire 523x targets
        m68knommu: fix gpio warnings for ColdFire 520x targets
        m68knommu: fix gpio warnings for ColdFire 5206e targets
        m68knommu: fix gpio warnings for ColdFire 5206 targets
        m68knommu: fixing compiler warnings
        m68knommu: limit interrupts supported by ColdFire intc-simr driver
        m68knommu: move some init code out of unmask routine for ColdFire intc-2
        m68knommu: limit interrupts supported by ColdFire intc-2 driver
        m68knommu: add basic support for the ColdFire based FireBee board
        m68knommu: make ColdFire internal peripheral region configurable
        m68knommu: clean up definitions of ColdFire peripheral base registers
        ...
      e3455133
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 242e5d06
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] tioca: Fix assignment from incompatible pointer warnings
        [IA64] mca.c: Fix cast from integer to pointer warning
        [IA64] setup.c Typo fix "Architechtuallly"
        [IA64] Add CONFIG_MISC_DEVICES=y to configs that need it.
        [IA64] disable interrupts at end of ia64_mca_cpe_int_handler()
        [IA64] Add DMA_ERROR_CODE define.
        pstore: fix build warning for unused return value from sysfs_create_file
        pstore: X86 platform interface using ACPI/APEI/ERST
        pstore: new filesystem interface to platform persistent storage
      242e5d06
    • L
      Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 · 4c5811bf
      Linus Torvalds 提交于
      * 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
        tty: serial: altera_jtaguart: Add device tree support
        tty: serial: altera_uart: Add devicetree support
        dt: eliminate of_platform_driver shim code
        dt: Eliminate of_platform_{,un}register_driver
        dt/serial: Eliminate users of of_platform_{,un}register_driver
        dt/usb: Eliminate users of of_platform_{,un}register_driver
        dt/video: Eliminate users of of_platform_{,un}register_driver
        dt/net: Eliminate users of of_platform_{,un}register_driver
        dt/sound: Eliminate users of of_platform_{,un}register_driver
        dt/spi: Eliminate users of of_platform_{,un}register_driver
        dt: uartlite: merge platform and of_platform driver bindings
        dt: xilinx_hwicap: merge platform and of_platform driver bindings
        ipmi: convert OF driver to platform driver
        leds/leds-gpio: merge platform_driver with of_platform_driver
        dt/sparc: Eliminate users of of_platform_{,un}register_driver
        dt/powerpc: Eliminate users of of_platform_{,un}register_driver
        dt/powerpc: move of_bus_type infrastructure to ibmebus
        drivercore/dt: add a match table pointer to struct device
        dt: Typo fix.
        altera_ps2: Add devicetree support
        ...
      4c5811bf
    • L
      Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl · f74b9444
      Linus Torvalds 提交于
      * 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
        BKL: That's all, folks
        fs/locks.c: Remove stale FIXME left over from BKL conversion
        ipx: remove the BKL
        appletalk: remove the BKL
        x25: remove the BKL
        ufs: remove the BKL
        hpfs: remove the BKL
        drivers: remove extraneous includes of smp_lock.h
        tracing: don't trace the BKL
        adfs: remove the big kernel lock
      f74b9444
    • R
      Merge branch 'p2v' into devel · 05e34754
      Russell King 提交于
      Conflicts:
      	arch/arm/kernel/module.c
      	arch/arm/mach-s5pv210/sleep.S
      05e34754
    • R
      Merge branch 'v6v7' into devel · bd1274dc
      Russell King 提交于
      Conflicts:
      	arch/arm/include/asm/cacheflush.h
      	arch/arm/include/asm/proc-fns.h
      	arch/arm/mm/Kconfig
      bd1274dc
    • R
      Merge branch 'misc' into devel · 1f0090a1
      Russell King 提交于
      Conflicts:
      	arch/arm/Kconfig
      1f0090a1
    • R
      Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini',... · 2472f3c8
      Russell King 提交于
      Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel
      2472f3c8
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 7a636280
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
        bonding: enable netpoll without checking link status
        xfrm: Refcount destination entry on xfrm_lookup
        net: introduce rx_handler results and logic around that
        bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
        bonding: wrap slave state work
        net: get rid of multiple bond-related netdevice->priv_flags
        bonding: register slave pointer for rx_handler
        be2net: Bump up the version number
        be2net: Copyright notice change. Update to Emulex instead of ServerEngines
        e1000e: fix kconfig for crc32 dependency
        netfilter ebtables: fix xt_AUDIT to work with ebtables
        xen network backend driver
        bonding: Improve syslog message at device creation time
        bonding: Call netif_carrier_off after register_netdevice
        bonding: Incorrect TX queue offset
        net_sched: fix ip_tos2prio
        xfrm: fix __xfrm_route_forward()
        be2net: Fix UDP packet detected status in RX compl
        Phonet: fix aligned-mode pipe socket buffer header reserve
        netxen: support for GbE port settings
        ...
      
      Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
      with the staging updates.
      7a636280
    • L
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 6445ced8
      Linus Torvalds 提交于
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (961 commits)
        staging: hv: fix memory leaks
        staging: hv: Remove NULL check before kfree
        Staging: hv: Get rid of vmbus_child_dev_add()
        Staging: hv: Change the signature for vmbus_child_device_register()
        Staging: hv: Get rid of vmbus_cleanup() function
        Staging: hv: Get rid of vmbus_dev_rm() function
        Staging: hv: Change the signature for vmbus_on_isr()
        Staging: hv: Eliminate vmbus_event_dpc()
        Staging: hv: Get rid of the function vmbus_msg_dpc()
        Staging: hv: Change the signature for vmbus_cleanup()
        Staging: hv: Simplify root device management
        staging: rtl8192e: Don't copy dev pointer to skb
        staging: rtl8192e: Pass priv to cmdpkt functions
        staging: rtl8192e: Pass priv to firmware download functions
        staging: rtl8192e: Pass priv to rtl8192_interrupt
        staging: rtl8192e: Pass rtl8192_priv to dm functions
        staging: rtl8192e: Pass ieee80211_device to callbacks
        staging: rtl8192e: Pass ieee80211_device to callbacks
        staging: rtl8192e: Pass ieee80211_device to callbacks
        staging: rtl8192e: Pass ieee80211_device to callbacks
        ...
      6445ced8
    • L
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · e6bee325
      Linus Torvalds 提交于
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
        pch_uart: reference clock on CM-iTC
        pch_phub: add new device ML7213
        n_gsm: fix UIH control byte : P bit should be 0
        n_gsm: add a documentation
        serial: msm_serial_hs: Add MSM high speed UART driver
        tty_audit: fix tty_audit_add_data live lock on audit disabled
        tty: move cd1865.h to drivers/staging/tty/
        Staging: tty: fix build with epca.c driver
        pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
        Staging: generic_serial: fix double locking bug
        nozomi: don't use flush_scheduled_work()
        tty/serial: Relax the device_type restriction from of_serial
        MAINTAINERS: Update HVC file patterns
        tty: phase out of ioctl file pointer for tty3270 as well
        tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
        pch_uart: Fix DMA channel miss-setting issue.
        pch_uart: fix exclusive access issue
        pch_uart: fix auto flow control miss-setting issue
        pch_uart: fix uart clock setting issue
        pch_uart : Use dev_xxx not pr_xxx
        ...
      
      Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
      twice, then changes to the same area in one branch)
      e6bee325
    • L
      Merge branch 'driver-core-next' of... · a5e6b135
      Linus Torvalds 提交于
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits)
        printk: do not mangle valid userspace syslog prefixes
        efivars: Add Documentation
        efivars: Expose efivars functionality to external drivers.
        efivars: Parameterize operations.
        efivars: Split out variable registration
        efivars: parameterize efivars
        efivars: Make efivars bin_attributes dynamic
        efivars: move efivars globals into struct efivars
        drivers:misc: ti-st: fix debugging code
        kref: Fix typo in kref documentation
        UIO: add PRUSS UIO driver support
        Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches
        firmware: Fix unaligned memory accesses in dmi-sysfs
        firmware: Add documentation for /sys/firmware/dmi
        firmware: Expose DMI type 15 System Event Log
        firmware: Break out system_event_log in dmi-sysfs
        firmware: Basic dmi-sysfs support
        firmware: Add DMI entry types to the headers
        Driver core: convert platform_{get,set}_drvdata to static inline functions
        Translate linux-2.6/Documentation/magic-number.txt into Chinese
        ...
      a5e6b135
    • L
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 971f115a
      Linus Torvalds 提交于
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (172 commits)
        USB: Add support for SuperSpeed isoc endpoints
        xhci: Clean up cycle bit math used during stalls.
        xhci: Fix cycle bit calculation during stall handling.
        xhci: Update internal dequeue pointers after stalls.
        USB: Disable auto-suspend for USB 3.0 hubs.
        USB: Remove bogus USB_PORT_STAT_SUPER_SPEED symbol.
        xhci: Return canceled URBs immediately when host is halted.
        xhci: Fixes for suspend/resume of shared HCDs.
        xhci: Fix re-init on power loss after resume.
        xhci: Make roothub functions deal with device removal.
        xhci: Limit roothub ports to 15 USB3 & 31 USB2 ports.
        xhci: Return a USB 3.0 hub descriptor for USB3 roothub.
        xhci: Register second xHCI roothub.
        xhci: Change xhci_find_slot_id_by_port() API.
        xhci: Refactor bus suspend state into a struct.
        xhci: Index with a port array instead of PORTSC addresses.
        USB: Set usb_hcd->state and flags for shared roothubs.
        usb: Make core allocate resources per PCI-device.
        usb: Store bus type in usb_hcd, not in driver flags.
        usb: Change usb_hcd->bandwidth_mutex to a pointer.
        ...
      971f115a
    • A
      vfs: bury ->get_sb() · 1a102ff9
      Al Viro 提交于
      This is an ex-parrot.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      1a102ff9
    • A
      nfs: switch NFS from ->get_sb() to ->mount() · 01194981
      Al Viro 提交于
      The last remaining instances of ->get_sb() can be converted ->mount()
      now - nothing in them uses new vfsmount anymore.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      01194981
    • A
      nfs: stop mangling ->mnt_devname on NFS · fd462fb5
      Al Viro 提交于
      now we can do that - nobody cares about its value anymore.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      fd462fb5
    • A
      vfs: new superblock methods to override /proc/*/mount{s,info} · c7f404b4
      Al Viro 提交于
      a) ->show_devname(m, mnt) - what to put into devname columns in mounts,
      mountinfo and mountstats
      b) ->show_path(m, mnt) - what to put into relative path column in mountinfo
      
      Leaving those NULL gives old behaviour.  NFS switched to using those.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      c7f404b4
    • A
      nfs: nfs_do_{ref,sub}mount() superblock argument is redundant · f8ad9c4b
      Al Viro 提交于
      It's always equal to dentry->d_sb
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      f8ad9c4b
    • A
      nfs: make nfs_path() work without vfsmount · b514f872
      Al Viro 提交于
      part 3: now we have everything to get nfs_path() just by dentry -
      just follow to (disconnected) root and pick the rest of the thing
      there.
      
      Start killing propagation of struct vfsmount * on the paths that
      used to bring it to nfs_path().
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      b514f872