Merge branch 'ep93xx-fixes' into ep93xx-for-next
Merge tag 'v3.4' into 20120409

Linux 3.4
Merge branch 'ep93xx-cleanup' into ep93xx-for-next
Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [media] radio-shark2: Only compile led support when CONFIG_LED_CLASS is set
  [media] radio-shark: Only compile led support when CONFIG_LED_CLASS is set
  [media] radio-shark*: Call cancel_work_sync from disconnect rather then release
  [media] radio-shark*: Remove work-around for dangling pointer in usb intfdata
  [media] Add USB dependency for IguanaWorks USB IR Transceiver
  [media] Add missing logging for rangelow/high of hwseek
  [media] VIDIOC_ENUM_FREQ_BANDS fix
  [media] mem2mem_testdev: fix querycap regression
  [media] si470x: v4l2-compliance fixes
  [media] DocBook: Remove a spurious character
  [media] uvcvideo: Reset the bytesused field when recycling an erroneous buffer
Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (242 commits)
  [media] ttpci: add support for Omicom S2 PCI
  [media] staging: media: Remove easycap driver
  [media] media: Add stk1160 new driver (easycap replacement)
  [media] qt1010: signedness bug in qt1010_init_meas1()
  [media] tda18218: silence compiler warning
  [media] tda18212: use Kernel dev_* logging
  [media] tda18212: silence compiler warning
  [media] mantis: fix silly crash case
  [media] dvb: nxt200x: apply levels to the printk()s
  [media] saa7164: use native print_hex_dump() instead of custom one
  [media] media: fix MEDIA_IOC_DEVICE_INFO return code
  [media] m88rs2000: add missing FE_HAS_SYNC flag
  [media] lmedm04: fix build
  [media] lmedm04 2.06 conversion to dvb-usb-v2 version 2
  [media] dvb core: remove support for post FE legacy ioctl intercept
  [media] staging: media: cxd2099: remove memcpy of similar structure variables
  [media] staging: media: cxd2099: use kzalloc to allocate ci pointer of type struct cxd in cxd2099_attach
  [media] staging: media: cxd2099: fix sparse warnings in cxd2099_attach
  [media] em28xx: Fix height setting on non-progressive captures
  [media] cpia2: Declare MODULE_FIRMWARE usage
  ...
Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (35 commits)
  [media] dvb_usb_v2: use %*ph to dump usb xfer debugs
  [media] dvb-usb: use %*ph to dump small buffers
  [media] saa7127: use %*ph to print small buffers
  [media] ati_remote: use %*ph to dump small buffers
  [media] dvb: use %*ph to hexdump small buffers
  [media] gspca: use %*ph to print small buffers
  [media] radio-shark2: use %*ph to print small buffers
  [media] dvb: frontends: use %*ph to dump small buffers
  [media] common: tunners: use %*ph to dump small buffers
  [media] dvb: get rid of fe_ioctl_override callback
  [media] staging: lirc: use %*ph to print small buffers
  [media] drivers/media/radio/radio-si4713.c: use devm_ functions
  [media] drivers/media/radio/radio-wl1273.c: use devm_ functions
  [media] drivers/media/radio/radio-timb.c: use devm_ functions
  [media] lirc: lirc_ene0100.h is not referenced anywhere
  [media] lirc: remove lirc_ttusbir driver
  [media] rc: transmit on device which does not support it should fail
  [media] saa7134: simplify timer activation
  [media] rc: do not wake up rc thread unless there is something to do
  [media] rc: Add support for the TechnoTrend USB IR Receiver
  ...
ocfs2: use find_last_bit()

We already have find_last_bit().  So just use it as described in the
comment.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
ocfs2: use bitmap_weight()

Use bitmap_weight() instead of reinventing the wheel.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
ocfs2/dlm: use GFP_ATOMIC inside a spin_lock

My static checker complains that this is called with a spin_lock held
in dlm_master_requery_handler() from dlmrecovery.c.  Probably the reason
we have not received any bug reports about this is that recovery is not
a common operation.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path

Commit ea022dfb3c2a4680483b00eb2fecc9fc4f6091d1 was missing a var init.

Reported-and-Tested-by: Vincent Etienne <vetienne@aprogsys.com>
Signed-off-by: Sunil Mushran <sunil.mushran@gmail.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
ocfs2: skip locks in the blocked list

  A parallel umount on 4 nodes triggered a bug in dlm_process_recovery_date(). Here’s the situation:
  Receiving MIG_LOCKRES message, A node processes the locks in migratable lockres. It copys lvb from migratable lockres when processing the first valid lock.
If there is a lock in the blocked list with the EX level, it triggers the BUG. Since valid lvbs are set when locks are granted with EX or PR levels, locks in
the blocked list cannot have valid lvbs. Therefore I think we should skip the locks in the blocked list.

Signed-off-by: Xuejiufei <xuejiufei@huawei.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
ocfs2: delay migration when the lockres is in migration state

  We trigger a bug in __dlm_lockres_reserve_ast() when we parallel umount 4 nodes. The situation is as follows:
  1) Node A migrate all lockres it owned(eg. lockres A) to other nodes say node B when it umounts.
  2) Receiving MIG_LOCKRES message from A, Node B masters the lockres A with DLM_LOCK_RES_MIGRATING state set.
  3) Then we umount ocfs2 on node B. It also should migrate lockres A to another node, say node C. But now, DLM_LOCK_RES_MIGRATING state
of lockers A is not cleared. Node B triggered the BUG on lockres with state DLM_LOCK_RES_MIGRATING.

Signed-off-by: Xuejiufei <xuejiufei@huawei.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
ocfs2: break useless while loop

Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
ocfs2: Don't spam on -EDQUOT.

-EDQUOT is a user-visible error, not a logic problem.  Teach
mlog_errno() to ignore it like it ignores -ENOSPC, etc.

Signed-off-by: Joel Becker <jlbec@evilplan.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Reported-by: Marek Królikowski <admin@wset.edu.pl>
Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [media] media: soc_camera: don't clear pix->sizeimage in JPEG mode
  [media] media: mx2_camera: Fix clock handling for i.MX27
  [media] video: mx2_camera: Use clk_prepare_enable/clk_disable_unprepare
  [media] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare
  [media] media: mx3_camera: buf_init() add buffer state check
Merge remote-tracking branch 'linus/master'

* linus/master: (127 commits)
  GPIO: gpio-pxa: fix building without CONFIG_OF
  drm/radeon: fix typo in function header comment
  drm/radeon/kms: implement timestamp userspace query (v2)
  drm/radeon/kms: add MSAA texture support for r600-evergreen
  drm/radeon/kms: reorder code in r600_check_texture_resource
  drm/radeon: fence virtual address and free it once idle v4
  drm/radeon: fix some missing parens in asic macros
  drm/radeon: add some new SI pci ids
  drm/radeon: fix ordering in pll picking on dce4+
  drm/radeon: do not reenable crtc after moving vram start address
  drm/radeon: fix bank tiling parameters on cayman
  drm/radeon: fix bank tiling parameters on evergreen
  drm/radeon: fix bank tiling parameters on SI
  drm/radeon: properly handle crtc powergating
  drm/radeon: properly handle SS overrides on TN (v2)
  drm/radeon/dce4+: set a more reasonable cursor watermark
  drm/radeon: fix handling for ddc type 5 on combios
  leds: renesas: fix error handling
  Revert "leds: use led_set_brightness in led_trigger_event"
  bnx2x: Fix compiler warnings
  ...
Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (82 commits)
  [media] media: soc_camera: don't clear pix->sizeimage in JPEG mode
  [media] media: mx3_camera: Improve data bus width check code for probe
  [media] mt9v022: Add support for mt9v024
  [media] media: mx2_camera: Fix clock handling for i.MX27
  [media] media: mx3_camera: buf_init() add buffer state check
  [media] dvb_usb_v2: ce6230, rtl28xxu use .reset_resume
  [media] dvb_usb_v2: af9015, af9035, anysee use .reset_resume
  [media] dvb_usb_v2: .reset_resume() support
  [media] dvb_frontend: implement suspend / resume
  [media] dvb_usb_v2: implement power-management for suspend
  [media] dvb_core: export function to perform retune
  [media] media: coda: add const qualifiers
  [media] anysee: convert Kernel dev_* logging
  [media] anysee: fix compiler warning
  [media] drivers/media/usb/{s2255drv.c, tm6000/tm6000-alsa.c, tm6000/tm6000-input.c}: Remove potential NULL dereferences
  [media] s5p-tv: Use devm_* functions in sii9234_drv.c file
  [media] s5p-tv: Replace printk with pr_* functions
  [media] s5p-tv: Use devm_regulator_get() in sdo_drv.c file
  [media] drivers/media/platform/mx2_emmaprp.c: use devm_kzalloc and devm_clk_get
  [media] DocBook validation fixes
  ...
Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork:
  [media] Fix some Makefile rules
  [media] cx23885-cards: fix netup card default revision
Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork:
  [media] b2c2: export b2c2_flexcop_debug symbol
Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork:
  [media] saa7164: Add dependency for V4L2 core
  [media] Kconfig: Fix b2c2 common code selection
  [media] Fix vino compilation
  gpio: bt8xx: Fix build error due to missing include file
  [media] Add missing help for some menuconfig items
  [media] flexcop: Show the item to enable debug after the driver
  [media] Kconfig: merge all customise options into just one
  [media] Kconfig: use menuconfig instead of menu
  [media] Cleanup media Kconfig files
  [media] Put the test devices together
  [media] Kconfig reorganization
  [media] move soc_camera to its own directory
  sh_mobile_csi2: move it to the right place