aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-07-27net: fix rtnetlink IFF_PROMISC and IFF_ALLMULTI handlingJiri Benc1-1/+7
When device flags are set using rtnetlink, IFF_PROMISC and IFF_ALLMULTI flags are handled specially. Function dev_change_flags sets IFF_PROMISC and IFF_ALLMULTI bits in dev->gflags according to the passed value but do_setlink passes a result of rtnl_dev_combine_flags which takes those bits from dev->flags. This can be easily trigerred by doing: tcpdump -i eth0 & ip l s up eth0 ip sets IFF_UP flag in ifi_flags and ifi_change, which is combined with IFF_PROMISC by rtnl_dev_combine_flags, causing __dev_change_flags to set IFF_PROMISC in gflags. Reported-by: Max Matveev <[email protected]> Signed-off-by: Jiri Benc <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-07-27USB: kaweth.c: use GFP_ATOMIC under spin_lockDan Carpenter1-1/+1
The problem is that we call this with a spin lock held. The call tree is: kaweth_start_xmit() holds kaweth->device_lock. -> kaweth_async_set_rx_mode() -> kaweth_control() -> kaweth_internal_control_msg() The kaweth_internal_control_msg() function is only called from kaweth_control() which used GFP_ATOMIC for its allocations. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-07-27tcp: Add TCP_USER_TIMEOUT negative value checkHangbin Liu1-1/+4
TCP_USER_TIMEOUT is a TCP level socket option that takes an unsigned int. But patch "tcp: Add TCP_USER_TIMEOUT socket option"(dca43c75) didn't check the negative values. If a user assign -1 to it, the socket will set successfully and wait for 4294967295 miliseconds. This patch add a negative value check to avoid this issue. Signed-off-by: Hangbin Liu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-07-27nfsd4: fix missing fault_inject.h includeJ. Bruce Fields1-0/+1
Signed-off-by: J. Bruce Fields <[email protected]>
2012-07-27RDMA/ucma: Convert open-coded equivalent to memdup_user()Roland Dreier1-12/+7
Suggested by scripts/coccinelle/api/memdup_user.cocci. Reported-by: Fengguang Wu <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2012-07-27locks: move lease-specific code out of locks_delete_lockJ. Bruce Fields1-6/+5
No point putting something only used by one caller into common code. Signed-off-by: J. Bruce Fields <[email protected]>
2012-07-27CIFS: Add SMB2 support for rmdirPavel Shilovsky3-0/+12
Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2012-07-27CIFS: Move rmdir code to ops structPavel Shilovsky5-13/+24
Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2012-07-27CIFS: Add SMB2 support for mkdir operationPavel Shilovsky3-0/+38
Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2012-07-27CIFS: Separate protocol specific part from mkdirPavel Shilovsky5-25/+49
Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2012-07-27CIFS: Simplify cifs_mkdir callPavel Shilovsky3-140/+167
Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2012-07-27RDMA/ocrdma: Fix check of GSI CQsRoland Dreier1-1/+3
It looks like one check was accidentally duplicated, and the other 3 checks were left out. This was detected by scripts/coccinelle/tests/doubletest.cocci: drivers/infiniband/hw/ocrdma/ocrdma_verbs.c:895:6-54: duplicated argument to && or || Reported-by: Fengguang Wu <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2012-07-27RDMA/cma: Use PTR_RET rather than if (IS_ERR(...)) + PTR_ERRFengguang Wu1-4/+1
Suggested by scripts/coccinelle/api/ptr_ret.cocci. Signed-off-by: Roland Dreier <[email protected]>
2012-07-27Merge tag 'tty-3.6-rc1' of ↵Linus Torvalds9-38/+93
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull TTY/Serial patches from Greg Kroah-Hartman: "Here's the "tiny" set of patches for 3.6-rc1 for the tty layer and serial drivers. They were cherry-picked from the tty-next branch of the tty git tree, as they are small and "obvious" fixes. The larger changes, as mentioned before, will be saved for the 3.7-rc1 merge window. All of these changes have been in the linux-next releases for quite a while. Signed-off-by: Greg Kroah-Hartman <[email protected]>" * tag 'tty-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: pch_uart: Fix parity setting issue pch_uart: Fix rx error interrupt setting issue pch_uart: Fix missing break for 16 byte fifo tty ldisc: Close/Reopen race prevention should check the proper flag pch_uart: Add eg20t_port lock field, avoid recursive spinlocks vt: fix race in vt_waitactive() serial/of-serial: Add LPC3220 standard UART compatible string serial/8250: Add LPC3220 standard UART type serial_core: Update buffer overrun statistics. serial: samsung: Fixed wrong comparison for baudclk_rate
2012-07-27Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds18-283/+44
Pull final kmap_atomic cleanups from Cong Wang: "This should be the final round of cleanup, as the definitions of enum km_type finally get removed from the whole tree. The patches have been in linux-next for a long time." * 'kmap_atomic' of git://github.com/congwang/linux: pipe: remove KM_USER0 from comments vmalloc: remove KM_USER0 from comments feature-removal-schedule.txt: remove kmap_atomic(page, km_type) tile: remove km_type definitions um: remove km_type definitions asm-generic: remove km_type definitions avr32: remove km_type definitions frv: remove km_type definitions powerpc: remove km_type definitions arm: remove km_type definitions highmem: remove the deprecated form of kmap_atomic tile: remove usage of enum km_type frv: remove the second parameter of kmap_atomic_primary() jbd2: remove the second argument of kmap_atomic
2012-07-27ALSA: hda - Fix WARNING from HDMI/DP parserTakashi Iwai1-0/+3
The recent fix to converter detaching timing in patch_hdmi.c leads to a kernel WARNING due to a sanity check when the debug option is set. Add a workaround by setting a dummy hinfo->nid. Signed-off-by: Takashi Iwai <[email protected]>
2012-07-27Merge branch 'merge' of ↵Linus Torvalds8-124/+128
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull powerpc fixes from Benjamin Herrenschmidt: "Here's a handful of powerpc patches, a couple of regression fixes for problems introduced in the main batch in this merge window, a couple of defconfig updates, and some trivials. The radeonfb one is something that was long standing in SLES which I forgot to pickup earlier." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ftrace: Trace function graph entry before updating index radeonfb: Add quirk for the graphics adapter in some JSxx powerpc: Lack of firmware flash support is not an error powerpc: Enable pseries hardware RNG and crypto modules powerpc: Update g5_defconfig powerpc/kvm/bookehv: Fix build regression powerpc: Set stack limit properly in crit_transfer_to_handler
2012-07-27Merge tag 'cpumask-for-linus' of ↵Linus Torvalds3-3/+16
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus Pull cpumask changes from Rusty Russell: "Trivial comment changes to cpumask code. I guess it's getting boring." Boring is good. * tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: cpumask: cpulist_parse() comments correction init: add comments to keep initcall-names in sync with initcall levels cpumask: add a few comments of cpumask functions
2012-07-27Merge branch 'master' of ↵John W. Linville3-13/+13
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-07-27ARM: Kirkwood: Replace mrvl with marvellAndrew Lunn6-6/+6
It has been decided to use marvell, not mrvl, in the compatibility property. Search & replace. Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.Andrew Lunn2-84/+50
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Josh Coombs <[email protected]>
2012-07-27ARM: Kirkwood: Describe Dreamplug LEDs in DT.Andrew Lunn2-34/+16
Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe iConnects LEDs in DT.Andrew Lunn2-46/+34
Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe iConnects temperature sensor in DT.Andrew Lunn2-10/+8
Now that we have I2C support in DT, describe the LM63 in the DT file for the iConnect. Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe IB62x0 LEDs in DT.Andrew Lunn2-36/+17
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.Andrew Lunn2-31/+16
Now that the GPIO controllers have been converted over to DT, described the gpio-keys in DT. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27ARM: Kirkwood: Describe DNS32? gpio-keys in DT.Jamie Lentin2-37/+21
Move description of GPIO keys on both the DNS320 and DNS325 into DT. Signed-off-by: Jamie Lentin <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsiJamie Lentin3-82/+50
A lot of device setup is shared between DNS-320 and DNS-325, move the definitions into a common include. Signed-off-by: Jamie Lentin <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindingsJamie Lentin3-90/+50
Replace code in board-dnskw with the equivalent devicetree bindings. Signed-off-by: Jamie Lentin <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe DNS325 temperature sensor in DT.Andrew Lunn2-13/+10
Now that we have I2C support in DT, describe the LM75 in the DT file for the DNS325. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jamie Lentin <[email protected]>
2012-07-27ARM: Kirkwood: Use DT to configure SATA device.Andrew Lunn9-20/+24
Convert boards using DT, but the old way of configuring SATA to now use properties in there DT file. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27ARM: kirkwood: use devicetree for SPI on dreamplugMichael Walle2-41/+29
Use the device tree for the SPI driver and partition layout. Signed-off-by: Michael Walle <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: kirkwood: Add LS-XHL and LS-CHLv2 supportMichael Walle9-0/+291
Add support for Buffalo Linkstation LS-XHL and LS-CHLv2 using the device tree where possible. Signed-off-by: Michael Walle <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex NetJosh Coombs7-0/+224
This patch supplies the necessary DTS and supporting files to boot up a Seagate GoFlex Net with 3.5.0-rc3. Signed-off-by: Joshua Coombs <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Add basic device tree support for QNAP TS219.Andrew Lunn9-0/+228
The two different variants of QNAP TS devices, varying by SoC, put the GPIO keys on different GPIO lines. Hence we need two different DT board descriptions, which share the same board-ts219.c file. Signed-off-by: Andrew Lunn <[email protected]> Acked-by: Jason Cooper <[email protected]>
2012-07-27ATA: sata_mv: Add device tree supportAndrew Lunn4-13/+53
Add support for instantiating this driver from device tree, and add the necassary DT information to the kirkwood.dtsi file. This is based on previous work by Michael Walle and Jason Cooper. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Josh Coombs <[email protected]>
2012-07-27ARM: Orion: DTify the watchdog timer.Andrew Lunn4-1/+29
Add device tree support to the Orion watchdog timer, and enable its use in the kirkwood devices using device tree. Signed-off-by: Andrew Lunn <[email protected]> Acked-by: Sebastian Hesselbarth <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27ARM: Orion: Add arch support needed for I2C via DT.Andrew Lunn4-0/+15
The MV64XXX I2C driver needs a clock in order to calculate the baud rate factors. So add an clk to the clk tree. Also add the base DT properties for kirkwood devices. Signed-off-by: Andrew Lunn <[email protected]> Conflicts: arch/arm/mach-kirkwood/common.c
2012-07-27ARM: kirkwood: use devicetree for orion-spiMichael Walle2-1/+17
Populate the devices with auxdata to set the device names which are used by clkdev to lookup the clocks. Signed-off-by: Michael Walle <[email protected]> Signed-off-by: Andrew Lunn <[email protected]> --- v2: Add interrupts properties, although not used.
2012-07-27ARM: Orion: DT support for IRQ and GPIO ControllersAndrew Lunn13-132/+307
Both IRQ and GPIO controllers can now be represented in DT. The IRQ controllers are setup first, and then the GPIO controllers. Interrupts for GPIO lines are placed directly after the main interrupts in the interrupt space. Signed-off-by: Andrew Lunn <[email protected]> Acked-by: Sebastian Hesselbarth <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Tested-by: Josh Coombs <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3Andrew Lunn16-30/+98
Merge in branch already pulled. Fulfils dependancies needed by this patchset.
2012-07-27Merge tag 'spi-3.6' into v3.5-rc7-dt-v3Andrew Lunn13-47/+430
spi: Updates for 3.6 Since Grant is even more specacularly busy than usual for the time being I've been collecting SPI patches for him for this release - probably things will revert back to Grant before the next release. There's nothing too exciting here, mostly it's simple driver specific stuff: - Add spi: to the modaliases of SPI devices to provide namespacing. - A driver for AD-FMCOMMS1-EBZ. - DT binding for Orion. - Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers. There may be a few more fixes I've missed, people keep sending me new things.
2012-07-27dm thin: commit before gathering statusAlasdair G Kergon15-20/+35
Commit outstanding metadata before returning the status for a dm thin pool so that the numbers reported are as up-to-date as possible. The commit is not performed if the device is suspended or if the DM_NOFLUSH_FLAG is supplied by userspace and passed to the target through a new 'status_flags' parameter in the target's dm_status_fn. The userspace dmsetup tool will support the --noflush flag with the 'dmsetup status' and 'dmsetup wait' commands from version 1.02.76 onwards. Tested-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2012-07-27dm thin: add read only and fail io modesJoe Thornber2-96/+344
Add read-only and fail-io modes to thin provisioning. If a transaction commit fails the pool's metadata device will transition to "read-only" mode. If a commit fails once already in read-only mode the transition to "fail-io" mode occurs. Once in fail-io mode the pool and all associated thin devices will report a status of "Fail". Signed-off-by: Joe Thornber <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2012-07-27dm thin metadata: introduce dm_pool_abort_metadataJoe Thornber2-61/+158
Introduce dm_pool_abort_metadata to abort the current metadata transaction. Generally this will only be called when bad things are happening and dm-thin is trying to roll back to a good state for read-only mode. It's complicated by the fact that the metadata device may have failed completely causing the abort to be unable to read the old transaction. In this case the metadata object is placed in a 'fail' mode and everything fails apart from destroying it. Signed-off-by: Joe Thornber <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2012-07-27dm thin metadata: introduce dm_pool_metadata_set_read_onlyJoe Thornber2-4/+22
Introduce dm_pool_metadata_set_read_only to put the underlying block manager into read-only mode. Signed-off-by: Joe Thornber <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2012-07-27dm persistent data: introduce dm_bm_set_read_onlyJoe Thornber2-0/+31
Introduce dm_bm_set_read_only to switch the block manager into a read-only mode. To be used when dm-thin degrades due to io errors on the metadata device. Signed-off-by: Joe Thornber <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2012-07-27dm thin: reduce number of metadata commitsJoe Thornber1-1/+7
Reduce the number of metadata commits by using dm_thin_changed_this_transaction to check if metadata was changed on a per thin device granularity. Signed-off-by: Joe Thornber <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2012-07-27dm thin metadata: add dm_thin_changed_this_transactionJoe Thornber2-3/+15
Introduce dm_thin_changed_this_transaction to dm-thin-metadata to publish a useful bit of information we're already tracking. This will help dm thin decide when to commit. Signed-off-by: Joe Thornber <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
2012-07-27dm thin metadata: add format option to dm_pool_metadata_openJoe Thornber3-10/+12
Add a parameter to dm_pool_metadata_open to indicate whether or not an unformatted metadata area should be formatted. Signed-off-by: Joe Thornber <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Alasdair G Kergon <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.