Changes in kdb_cmds

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/kernel/debug/kdb/kdb_cmds

e4da3fbfbd1de56d2367653e3823e6445e49f8a9 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next

Thu, 01 Dec 2011 11:14:48 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next List of files: /linux/kernel/debug/kdb/kdb_cmds

d4bbf7e7759afc172e2bfbc5c416324590049cdd - Merge branch 'master' into x86/memblock

Mon, 28 Nov 2011 18:46:22 +0100

Merge branch 'master' into x86/memblockConflicts & resolutions:* arch/x86/xen/setup.c dc91c728fd "xen: allow extra memory to be in multiple regions" 24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..." conflicted on xen_add_extra_mem() updates. The resolution is trivial as the latter just want to replace memblock_x86_reserve_range() with memblock_reserve().* drivers/pci/intel-iommu.c 166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/" 5dfe8660a3d "bootmem: Replace work_with_active_regions() with..." conflicted as the former moved the file under drivers/iommu/. Resolved by applying the chnages from the latter on the moved file.* mm/Kconfig 6661672053a "memblock: add NO_BOOTMEM config symbol" c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option" conflicted trivially. Both added config options. Just letting both add their own options resolves the conflict.* mm/memblock.c d1f0ece6cdc "mm/memblock.c: small function definition fixes" ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()" confliected. The former updates function removed by the latter. Resolution is trivial.Signed-off-by: Tejun Heo List of files: /linux/kernel/debug/kdb/kdb_cmds

6ad390a25a9d1d8606b9b826878f0a30639dc2b3 - Merge branch 'next' into for-linus

Thu, 27 Oct 2011 06:46:20 +0200

Merge branch 'next' into for-linus List of files: /linux/kernel/debug/kdb/kdb_cmds

d20bbfab01802e195a50435940f7e4aa747c217c - Merge branch 'slab/urgent' into slab/next

Mon, 19 Sep 2011 16:46:07 +0200

Merge branch 'slab/urgent' into slab/next List of files: /linux/kernel/debug/kdb/kdb_cmds

7577911244c437f4a4abac5e4b67b059c06dbe9d - Merge tag 'v3.1-rc6' into staging/for_v3.2

Sat, 17 Sep 2011 15:29:49 +0200

Merge tag 'v3.1-rc6' into staging/for_v3.2* tag 'v3.1-rc6': (1902 commits) Linux 3.1-rc6 ioctl: register LTTng ioctl fuse: fix memory leak fuse: fix flock breakage Btrfs: add dummy extent if dst offset excceeds file end in Btrfs: calc file extent num_bytes correctly in file clone btrfs: xattr: fix attribute removal Btrfs: fix wrong nbytes information of the inode Btrfs: fix the file extent gap when doing direct IO Btrfs: fix unclosed transaction handle in btrfs_cont_expand Btrfs: fix misuse of trans block rsv Btrfs: reset to appropriate block rsv after orphan operations Btrfs: skip locking if searching the commit root in csum lookup btrfs: fix warning in iput for bad-inode Btrfs: fix an oops when deleting snapshots [media] vp7045: fix buffer setup [media] nuvoton-cir: simplify raw IR sample handling [media] [Resend] viacam: Don't explode if pci_find_bus() returns NULL [media] v4l2: Fix documentation of the codec device controls [media] gspca - sonixj: Fix the darkness of sensor om6802 in 320x240 ... List of files: /linux/kernel/debug/kdb/kdb_cmds

e060c38434b2caa78efe7cedaff4191040b65a15 - Merge branch 'master' into for-next

Thu, 15 Sep 2011 15:08:05 +0200

Merge branch 'master' into for-nextFast-forward merge with Linus to be able to merge patchesbased on more recent version of the tree. List of files: /linux/kernel/debug/kdb/kdb_cmds

7e66eaf14e19c032433be7c4df3c892fa2a5282f - Merge commit 'v3.1-rc4' into next

Wed, 07 Sep 2011 23:18:36 +0200

Merge commit 'v3.1-rc4' into next List of files: /linux/kernel/debug/kdb/kdb_cmds

94bd217e2d683719ab21a4ac117d8a1b91cbedc9 - Merge commit 'v3.1-rc2' into HEAD

Wed, 17 Aug 2011 18:14:01 +0200

Merge commit 'v3.1-rc2' into HEAD List of files: /linux/kernel/debug/kdb/kdb_cmds

2d9f8a6e73ef2ec8ecaa24ca98e7010d6edd089f - Merge branch 'fix/hda' into topic/hda

Mon, 15 Aug 2011 12:47:19 +0200

Merge branch 'fix/hda' into topic/hda List of files: /linux/kernel/debug/kdb/kdb_cmds

0a2d31b62dba9b5b92a38c67c9cc42630513662a - Merge branch 'fix/kconfig' into for-linus

Mon, 08 Aug 2011 14:30:29 +0200

Merge branch 'fix/kconfig' into for-linus List of files: /linux/kernel/debug/kdb/kdb_cmds

2ddb4e94065470828e131351566102274ea9e83f - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Mon, 08 Aug 2011 14:06:24 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux List of files: /linux/kernel/debug/kdb/kdb_cmds

8c285645ab3b05942124020b5f0b89d3b539823a - Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc

Mon, 08 Aug 2011 10:45:31 +0200

Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc List of files: /linux/kernel/debug/kdb/kdb_cmds

4791d63bd40ec63c533060707dae0232b9969dc0 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Mon, 08 Aug 2011 09:41:23 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest List of files: /linux/kernel/debug/kdb/kdb_cmds

1a43f2012455a977397deffe35912fd3f3ce17b9 - Merge commit 'v3.1-rc1' into imx-fixes

Mon, 08 Aug 2011 08:22:41 +0200

Merge commit 'v3.1-rc1' into imx-fixes List of files: /linux/kernel/debug/kdb/kdb_cmds

19fd61785a580c60cba900c5171bfadb57dd5056 - Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

Mon, 08 Aug 2011 08:20:26 +0200

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net List of files: /linux/kernel/debug/kdb/kdb_cmds

18d4ed4342c14ebeebe60d267b171053efcdfa87 - Merge branch 'for-3.1' into for-3.2

Mon, 08 Aug 2011 07:56:19 +0200

Merge branch 'for-3.1' into for-3.2Conflict due to the fix for the register map failure - taken the for-3.1version.Conflicts: sound/soc/codecs/sgtl5000.c List of files: /linux/kernel/debug/kdb/kdb_cmds

b6741d1fe947f829bd4303397fd888e1d4b66bae - Merge 3.1-rc1 into usb-linus

Mon, 08 Aug 2011 06:08:28 +0200

Merge 3.1-rc1 into usb-linusGives us a good starting point to base patches off of.Signed-off-by: Greg Kroah-Hartman List of files: /linux/kernel/debug/kdb/kdb_cmds

3272cab4063467410802367a8d69f06c65b2a866 - Merge branch 'linus' into perf/urgent

Fri, 05 Aug 2011 10:32:54 +0200

Merge branch 'linus' into perf/urgentMerge reason: Include most of the merge window trees, to do fixes on top.Signed-off-by: Ingo Molnar List of files: /linux/kernel/debug/kdb/kdb_cmds

c25bdbe2886327aedc2248c7227931eaee483f25 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

Thu, 04 Aug 2011 19:04:12 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 List of files: /linux/kernel/debug/kdb/kdb_cmds