aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-16sparc: Replace open coded page alignment with PAGE_ALIGN macro.Kristoffer Glembo1-14/+11
Signed-off-by: Kristoffer Glembo <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds178-1725/+1407
* '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 ...
2011-03-16Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds55-619/+220
* '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
2011-03-16Merge branch 'p2v' into develRussell King86-189/+434
Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S
2011-03-16Merge branch 'v6v7' into develRussell King28-189/+191
Conflicts: arch/arm/include/asm/cacheflush.h arch/arm/include/asm/proc-fns.h arch/arm/mm/Kconfig
2011-03-16Merge branch 'misc' into develRussell King38-791/+461
Conflicts: arch/arm/Kconfig
2011-03-16Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', ↵Russell King688-6225/+11694
'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel
2011-03-16Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds1143-37918/+119131
* 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.
2011-03-16Merge branch 'staging-next' of ↵Linus Torvalds835-87750/+91150
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * '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 ...
2011-03-16Merge branch 'tty-next' of ↵Linus Torvalds222-1357/+3925
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * '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)
2011-03-16Merge branch 'driver-core-next' of ↵Linus Torvalds44-913/+2890
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 ...
2011-03-16Merge branch 'usb-next' of ↵Linus Torvalds167-4051/+10850
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * '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. ...
2011-03-16vfs: bury ->get_sb()Al Viro5-103/+47
This is an ex-parrot. Signed-off-by: Al Viro <[email protected]>
2011-03-16nfs: switch NFS from ->get_sb() to ->mount()Al Viro1-66/+66
The last remaining instances of ->get_sb() can be converted ->mount() now - nothing in them uses new vfsmount anymore. Signed-off-by: Al Viro <[email protected]>
2011-03-16nfs: stop mangling ->mnt_devname on NFSAl Viro1-23/+0
now we can do that - nobody cares about its value anymore. Signed-off-by: Al Viro <[email protected]>
2011-03-16vfs: new superblock methods to override /proc/*/mount{s,info}Al Viro3-9/+60
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: Al Viro <[email protected]>
2011-03-16nfs: nfs_do_{ref,sub}mount() superblock argument is redundantAl Viro3-18/+13
It's always equal to dentry->d_sb Signed-off-by: Al Viro <[email protected]>
2011-03-16nfs: make nfs_path() work without vfsmountAl Viro4-62/+74
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: Al Viro <[email protected]>
2011-03-16nfs: store devname at disconnected NFS rootsAl Viro3-4/+65
part 2: make sure that disconnected roots have corresponding mnt_devname values stashed into them. Have nfs*_get_root() stuff a copy of devname into ->d_fsdata of the found root, provided that it is disconnected. Have ->d_release() free it when dentry goes away. Have the places where NFS uses ->d_fsdata for sillyrename (and that can *never* happen to a disconnected root - dentry will be attached to its parent) free old devname copies if they find those. Signed-off-by: Al Viro <[email protected]>
2011-03-16nfs: propagate devname to nfs{,4}_get_root()Al Viro3-9/+13
step 1 of ->mnt_devname fixes: make sure we have the value of devname available in ..._get_root(). Signed-off-by: Al Viro <[email protected]>
2011-03-16Merge branch 'for-linus' of ↵Linus Torvalds1-1/+3
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: fix cdev leak on O_PATH final fput()
2011-03-16fix cdev leak on O_PATH final fput()Miklos Szeredi1-1/+3
__fput doesn't need a cdev_put() for O_PATH handles. Signed-off-by: [email protected] Signed-off-by: Al Viro <[email protected]>
2011-03-16bonding: enable netpoll without checking link statusAndy Gospodarek1-2/+0
Only slaves that are up should transmit netpoll frames, so there is no need to check to see if a slave is up before enabling netpoll on it. This resolves a reported failure on active-backup bonds where a slave interface is down when netpoll was enabled. Signed-off-by: Andy Gospodarek <[email protected]> Tested-by: WANG Cong <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16xfrm: Refcount destination entry on xfrm_lookupSteffen Klassert1-0/+2
We return a destination entry without refcount if a socket policy is found in xfrm_lookup. This triggers a warning on a negative refcount when freeeing this dst entry. So take a refcount in this case to fix it. This refcount was forgotten when xfrm changed to cache bundles instead of policies for outgoing flows. Signed-off-by: Steffen Klassert <[email protected]> Acked-by: Timo Teräs <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16net: introduce rx_handler results and logic around thatJiri Pirko8-39/+98
This patch allows rx_handlers to better signalize what to do next to it's caller. That makes skb->deliver_no_wcard no longer needed. kernel-doc for rx_handler_result is taken from Nicolas' patch. Signed-off-by: Jiri Pirko <[email protected]> Reviewed-by: Nicolas de Pesloüan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flagJiri Pirko3-10/+14
Since bond-related code was moved from net/core/dev.c into bonding, IFF_SLAVE_INACTIVE is no longer needed. Replace is with flag "inactive" stored in slave structure Signed-off-by: Jiri Pirko <[email protected]> Reviewed-by: Nicolas de Pesloüan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16bonding: wrap slave state workJiri Pirko4-25/+46
transfers slave->state into slave->backup (that it's going to transfer into bitfield. Introduce wrapper inlines to do the work with it. Signed-off-by: Jiri Pirko <[email protected]> Reviewed-by: Nicolas de Pesloüan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16net: get rid of multiple bond-related netdevice->priv_flagsJiri Pirko3-50/+15
Now when bond-related code is moved from net/core/dev.c into bonding code, multiple priv_flags are not needed anymore. So let them rot. Signed-off-by: Jiri Pirko <[email protected]> Reviewed-by: Nicolas de Pesloüan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16bonding: register slave pointer for rx_handlerJiri Pirko2-6/+14
Register slave pointer as rx_handler data. That would eventually prevent need to loop over slave devices to find the right slave. Use synchronize_net to ensure that bond_handle_frame does not get slave structure freed when working with that. Signed-off-by: Jiri Pirko <[email protected]> Reviewed-by: Nicolas de Pesloüan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16be2net: Bump up the version numberAjit Khaparde1-1/+1
Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16be2net: Copyright notice change. Update to Emulex instead of ServerEnginesAjit Khaparde6-30/+30
Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16e1000e: fix kconfig for crc32 dependencyEric Dumazet1-0/+1
ERROR: "crc32_le" [drivers/net/e1000e/e1000e.ko] undefined! Reported-by: Frank Peters <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Cc: Bruce Allan <[email protected]> Cc: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-03-16Merge branch 'master' of ↵David S. Miller1-9/+27
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
2011-03-16m68k/block: amiflop - Remove superfluous amiga_chip_alloc() castGeert Uytterhoeven1-2/+2
amiga_chip_alloc() returns a void *, so we don't need a cast. Also clean up coding style while we're at it. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k/atari: ARAnyM - Add support for network accessMilan Jurik3-0/+279
[petr: Second author] [michael, geert: Cleanups and updates] Signed-off-by: Milan Jurik <[email protected]> Signed-off-by: Petr Stehlik <[email protected]> Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: [email protected]
2011-03-16m68k/atari: ARAnyM - Add support for console accessRoman Zippel4-38/+171
[geert: Cleanups and updates] Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Petr Stehlik <[email protected]>
2011-03-16m68k/atari: ARAnyM - Add support for block accessRoman Zippel3-0/+205
[geert: Cleanups and updates] Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Petr Stehlik <[email protected]>
2011-03-16m68k/atari: Initial ARAnyM supportPetr Stehlik6-0/+156
Add improved support for running under the ARAnyM emulator (Atari Running on Any Machine - http://aranym.org/). [michael, geert: Cleanups and updates] Signed-off-by: Petr Stehlik <[email protected]> Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k: Kconfig - Remove unneeded "default n"Geert Uytterhoeven1-2/+0
Reported-by: Phillip Lougher <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k: Makefiles - Change to new flags variablesmatt mooney1-2/+2
Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney <[email protected]> Acked-by: WANG Cong <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k/amiga: Reclaim Chip RAM for PPC exception handlersGeert Uytterhoeven1-4/+0
On m68k, it doesn't make sense to reserve memory for the PPC exception handlers, and APUS support is dead. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k: Allow all kernel traps to be handled via exception fixupsAndreas Schwab1-3/+7
This will be needed by the ARAnyM Native Feature initialization code. Also document that the VEC_TRACE check is needed for 68020/30. Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k: Use base_trap_init() to initialize vectorsRoman Zippel1-5/+5
So basic initialization is all in one place. Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16m68k: Add helper function handle_kernel_fault()Roman Zippel3-16/+26
Add helper function handle_kernel_fault() in signal.c, so frame_extra_sizes can become static, and to avoid future code duplication. Signed-off-by: Roman Zippel <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-03-16Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegraLinus Torvalds42-1039/+3784
* 'for-linus' of git://android.git.kernel.org/kernel/tegra: (61 commits) ARM: tegra: trimslice: initialize PCI-e only when running on TrimSlice ARM: tegra: add PCI Express power gating ARM: tegra: PCIE minor code refactoring ARM: Tegra: DMA: Fail safe if initialization fails ARM: Tegra: Rename clk_dev1/2 to cdev1/2 ARM: Tegra: Rename I2S clocks to match driver name ARM: Tegra: Make tegra_dma_init a postcore_initcall ARM: tegra: add seaboard, wario and kaen boards ARM: tegra: harmony: fix pinmux for MMC slot ARM: tegra: harmony: register sdhci devices ARM: tegra: remove stale nvidia atag handler ARM: tegra: common device resources ARM: tegra: harmony: move over to tegra_gpio_config ARM: tegra: add tegra_gpio_table and tegra_gpio_config ARM: tegra: Hide EMC scaling config behind ARCH_TEGRA ARM: tegra: Fix typo in TEGRA_IRQ_TO_GPIO ARM: tegra: common: Enable core clocks ARM: tegra: timer: Enable timer and rtc clocks ARM: tegra: Move tegra_common_init to tegra_init_early ARM: tegra: clock: prevent accidental disables of cpu clock ...
2011-03-16Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds36-317/+347
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (33 commits) microblaze: Do not copy reset vectors/manual reset vector setup microblaze: Fix _reset function microblaze: Fix microblaze init vectors microblaze: Fix circular headers dependency when ftrace is enabled. microblaze: Fix typo in Kconfig microblaze: Add missing export symbols for lib functions microblaze: Fix /dev/zero corruption from __clear_user() microblaze: Convert irq_chip to new functions microblaze: Select GENERIC_HARDIRQS_NO_DEPRECATED microblaze: Remove stale irq_chip.end microblaze: Fix sparse warnings - signal.c microblaze: Fix sparse warning - fault.c microblaze: Fix missing microblaze specific syscalls declaration microblaze: Fix sparse warnings - cache.c microblaze: Fix sparse warning - cpuinfo.h microblaze: Fix sparse warning - unwind.c microblaze: Fix sparse warning - consistent_alloc function microblaze: Fix sparse warnings - ptrace microblaze: Fix sparse warning - sw_exceptions microblaze: Fix sparse warning - timer.c ...
2011-03-16sched.c: fix kernel-doc for runqueue_is_locked()Randy Dunlap1-2/+1
Fix kernel-doc warning for runqueue_is_locked(): Warning(kernel/sched.c:664): missing initial short description on line: Signed-off-by: Randy Dunlap <[email protected]> Cc: Ingo Molnar <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-16Documentation: update cgroup pid and cpuset informationEric B Munson1-0/+12
The cgroup documentation does not specify how a process can be removed from a particular group. This patch adds a note at the end of the simple example about how this is done. Also, some cgroups (like cpusets) require user input before a new group can be used. This is noted in the patch as well. Signed-off-by: Eric B Munson <[email protected]> Acked-by: Paul Menage <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-16Documentation: file handles are now freedFederica Teodori1-9/+8
Since file handles are freed, a little amendment to the documentation Signed-off-by: Federica Teodori <[email protected]> Acked-by: Rik van Riel<[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-16Documentation: update header filename in CodingStyleRoland Kammerer1-4/+1
pr_info() and pr_debug() are in linux/printk.h, not linux/kernel.h. Last updated is unnecessary, we have git for that. Signed-off-by: Roland Kammerer <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Acked-by: Harry Wei <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.