Changes in TODO

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/gpu/drm/omapdrm/TODO

bf61c8840efe60fd8f91446860b63338fb424158 - Merge branch 'next' into for-linus

Wed, 01 May 2013 17:47:44 +0200

Merge branch 'next' into for-linusPrepare first set of updates for 3.10 merge window. List of files: /linux/drivers/gpu/drm/omapdrm/TODO

f53f292eeaa234615c31a1306babe703fc4263f2 - Merge remote-tracking branch 'efi/chainsaw' into x86/efi

Sat, 20 Apr 2013 18:16:44 +0200

Merge remote-tracking branch 'efi/chainsaw' into x86/efiResolved Conflicts: drivers/firmware/efivars.c fs/efivarsfs/file.cSigned-off-by: H. Peter Anvin List of files: /linux/drivers/gpu/drm/omapdrm/TODO

dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 - Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

Mon, 01 Apr 2013 21:33:50 +0200

Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmpConflicts: arch/arm/plat-omap/dmtimer.c List of files: /linux/drivers/gpu/drm/omapdrm/TODO

6aeedba20e82150757f2dd5b896f0e09491a987c - Merge tag v3.9-rc1 into for-3.9/upstream-fixes

Fri, 29 Mar 2013 15:12:10 +0100

Merge tag v3.9-rc1 into for-3.9/upstream-fixesThis is done so that I am able to apply fix for commit0322bd3980b3 ("usb hid quirks for Masterkit MA901 usb radio") whichwent into 3.9-rc1. List of files: /linux/drivers/gpu/drm/omapdrm/TODO

b3fecf8cab6441527ab057c99d7e6a6d7f6713e5 - Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-3.10/mt-hybrid-finger-pen

Wed, 27 Mar 2013 14:02:27 +0100

Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-3.10/mt-hybrid-finger-pen List of files: /linux/drivers/gpu/drm/omapdrm/TODO

0d4a42f6bd298e826620585e766a154ab460617a - Merge tag 'v3.9-rc3' into drm-intel-next-queued

Tue, 19 Mar 2013 09:47:30 +0100

Merge tag 'v3.9-rc3' into drm-intel-next-queuedBackmerge so that I can merge Imre Deak's coalesced sg entries fixes,which depend upon the new for_each_sg_page introduce incommit a321e91b6d73ed011ffceed384c40d2785cf723bAuthor: Imre Deak Date: Wed Feb 27 17:02:56 2013 -0800 lib/scatterlist: add simple page iteratorThe merge itself is just two trivial conflicts:Signed-off-by: Daniel Vetter List of files: /linux/drivers/gpu/drm/omapdrm/TODO

d608d71cd6d19792487d08333d63c7ff20294694 - Merge tag 'v3.9-rc3' into v4l_for_linus

Tue, 19 Mar 2013 00:58:00 +0100

Merge tag 'v3.9-rc3' into v4l_for_linusLinux 3.9-rc3* tag 'v3.9-rc3': (11231 commits) Linux 3.9-rc3 perf,x86: fix link failure for non-Intel configs perf,x86: fix wrmsr_on_cpu() warning on suspend/resume Btrfs: fix warning of free_extent_map perf,x86: fix kernel crash with PEBS/BTS after suspend/resume ALSA: hda - Fix missing EAPD/GPIO setup for Cirrus codecs sound: sequencer: cap array index in seq_chn_common_event() mfd: twl4030-madc: Remove __exit_p annotation ALSA: hda/ca0132 - Remove extra setting of dsp_state. ALSA: hda/ca0132 - Check download state of DSP. ALSA: hda/ca0132 - Check if dspload_image succeeded. mm/fremap.c: fix possible oops on error path list: Fix double fetch of pointer in hlist_entry_safe() Btrfs: fix warning when creating snapshots Btrfs: return as soon as possible when edquot happens Btrfs: return EIO if we have extent tree corruption btrfs: use rcu_barrier() to wait for bdev puts at unmount Btrfs: remove btrfs_try_spin_lock Btrfs: get better concurrency for snapshot-aware defrag work hwmon: (pmbus/ltc2978) Fix temperature reporting ... List of files: /linux/drivers/gpu/drm/omapdrm/TODO

aa1262b3876ec5249ff464618a7dcd46b3ca54e2 - Merge branch 'master' into for-next

Mon, 18 Mar 2013 10:57:32 +0100

Merge branch 'master' into for-nextSync with Linus' tree to be able to apply patch to the newlyadded ITG-3200 driver. List of files: /linux/drivers/gpu/drm/omapdrm/TODO

688d794c4c3f8b08c814381ee2edd3ede5856056 - Merge tag 'v3.9-rc3' into next

Mon, 18 Mar 2013 03:40:50 +0100

Merge tag 'v3.9-rc3' into nextMerge with mainline to bring in module_platform_driver_probe() anddevm_ioremap_resource(). List of files: /linux/drivers/gpu/drm/omapdrm/TODO

2c4cdf5950b1a7a9d731c03c56e2cea3bd8ca7b7 - Merge tag 'v3.9-rc2' into next

Mon, 11 Mar 2013 02:54:48 +0100

Merge tag 'v3.9-rc2' into nextSync with Linus.Linux 3.9-rc2 List of files: /linux/drivers/gpu/drm/omapdrm/TODO

83a44ac8bf4a8e6cbbf0c00ff281a482778f708a - HID: Merge branch 'master' into for-3.10/hid-driver-transport-cleanups

Sat, 09 Mar 2013 10:58:13 +0100

HID: Merge branch 'master' into for-3.10/hid-driver-transport-cleanupsSync with Linus' tree. This is necessary to resolve build conflictcaused by dcd9006b1b053c7b ("HID: logitech-dj: do not directly callhid_output_raw_report() during probe") which issues direct call tousbhid_submit_report(), but that is gone in this branch andhid_hw_request() has to be used instead.Signed-off-by: Jiri Kosina List of files: /linux/drivers/gpu/drm/omapdrm/TODO

ee2c25efdd46d7ed5605d6fe877bdf4b47a4ab2e - Merge branch 'master' into queue

Tue, 05 Mar 2013 00:10:32 +0100

Merge branch 'master' into queue* master: (15791 commits) Linux 3.9-rc1 btrfs/raid56: Add missing #include fix compat_sys_rt_sigprocmask() SUNRPC: One line comment fix ext4: enable quotas before orphan cleanup ext4: don't allow quota mount options when quota feature enabled ext4: fix a warning from sparse check for ext4_dir_llseek ext4: convert number of blocks to clusters properly ext4: fix possible memory leak in ext4_remount() jbd2: fix ERR_PTR dereference in jbd2__journal_start metag: Provide dma_get_sgtable() metag: prom.h: remove declaration of metag_dt_memblock_reserve() metag: copy devicetree to non-init memory metag: cleanup metag_ksyms.c includes metag: move mm/init.c exports out of metag_ksyms.c metag: move usercopy.c exports out of metag_ksyms.c metag: move setup.c exports out of metag_ksyms.c metag: move kick.c exports out of metag_ksyms.c metag: move traps.c exports out of metag_ksyms.c metag: move irq enable out of irqflags.h on SMP ...Signed-off-by: Marcelo Tosatti Conflicts: arch/x86/kernel/kvmclock.c List of files: /linux/drivers/gpu/drm/omapdrm/TODO

d34c353cd40ff0e6e5ed3753e80f6aa7eaa2c298 - Merge tag 'v3.9-rc1' into staging/for_v3.9

Mon, 04 Mar 2013 15:07:08 +0100

Merge tag 'v3.9-rc1' into staging/for_v3.9Linux 3.9-rc1* tag 'v3.9-rc1': (10698 commits) Linux 3.9-rc1 btrfs/raid56: Add missing #include fix compat_sys_rt_sigprocmask() SUNRPC: One line comment fix ext4: enable quotas before orphan cleanup ext4: don't allow quota mount options when quota feature enabled ext4: fix a warning from sparse check for ext4_dir_llseek ext4: convert number of blocks to clusters properly ext4: fix possible memory leak in ext4_remount() jbd2: fix ERR_PTR dereference in jbd2__journal_start metag: Provide dma_get_sgtable() metag: prom.h: remove declaration of metag_dt_memblock_reserve() metag: copy devicetree to non-init memory metag: cleanup metag_ksyms.c includes metag: move mm/init.c exports out of metag_ksyms.c metag: move usercopy.c exports out of metag_ksyms.c metag: move setup.c exports out of metag_ksyms.c metag: move kick.c exports out of metag_ksyms.c metag: move traps.c exports out of metag_ksyms.c metag: move irq enable out of irqflags.h on SMP ... List of files: /linux/drivers/gpu/drm/omapdrm/TODO

fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb - Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Tue, 26 Feb 2013 01:46:44 +0100

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxPull drm merge from Dave Airlie: "Highlights: - TI LCD controller KMS driver - TI OMAP KMS driver merged from staging - drop gma500 stub driver - the fbcon locking fixes - the vgacon dirty like zebra fix. - open firmware videomode and hdmi common code helpers - major locking rework for kms object handling - pageflip/cursor won't block on polling anymore! - fbcon helper and prime helper cleanups - i915: all over the map, haswell power well enhancements, valleyview macro horrors cleaned up, killing lots of legacy GTT code, - radeon: CS ioctl unification, deprecated UMS support, gpu reset rework, VM fixes - nouveau: reworked thermal code, external dp/tmds encoder support (anx9805), fences sleep instead of polling, - exynos: all over the driver fixes."Lovely conflict in radeon/evergreen_cs.c between commit de0babd60d8d("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")and the new changes that modified that evergreen_dma_cs_parse()function.* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (508 commits) drm/tilcdc: only build on arm drm/i915: Revert hdmi HDP pin checks drm/tegra: Add list of framebuffers to debugfs drm/tegra: Fix color expansion drm/tegra: Split DC_CMD_STATE_CONTROL register write drm/tegra: Implement page-flipping support drm/tegra: Implement VBLANK support drm/tegra: Implement .mode_set_base() drm/tegra: Add plane support drm/tegra: Remove bogus tegra_framebuffer structure drm: Add consistency check for page-flipping drm/radeon: Use generic HDMI infoframe helpers drm/tegra: Use generic HDMI infoframe helpers drm: Add EDID helper documentation drm: Add HDMI infoframe helpers video: Add generic HDMI infoframe helpers drm: Add some missing forward declarations drm: Move mode tables to drm_edid.c drm: Remove duplicate drm_mode_cea_vic() gma500: Fix n, m1 and m2 clock limits for sdvo and lvds ... List of files: /linux/drivers/gpu/drm/omapdrm/TODO

8e26875e21f7b01787018cbc0faf8bd099599cdb - Merge branch 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux into drm-next

Tue, 19 Feb 2013 03:01:55 +0100

Merge branch 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux into drm-next* 'omapdrm-next' of git://people.freedesktop.org/~robclark/linux: drm/omap: remove fbdev debug enter/leave hooks omapdrm: simplify locking in the fb debugfs file omapdrm: only take crtc->mutex in crtc callbacks drm/omap: move out of staging staging/omapdrm: Use kmemdup rather than duplicating its implementation staging: omapdrm/omap_gem_dmabuf.c: fix memory leakage drm/omap: Add OMAP5 support drm/omap: Add PM capabilities List of files: /linux/drivers/gpu/drm/omapdrm/TODO

8bb0daffb0b8e45188066255b4203446eae181f1 - drm/omap: move out of staging

Mon, 11 Feb 2013 18:43:09 +0100

drm/omap: move out of stagingNow that the omapdss interface has been reworked so that omapdrm can usedispc directly, we have been able to fix the remaining functional kmsissues with omapdrm. And in the mean time the PM sequencing and manyother of that open issues have been solved. So I think it makes senseto finally move omapdrm out of staging.Signed-off-by: Rob Clark List of files: /linux/drivers/gpu/drm/omapdrm/TODO