)]}' { "log": [ { "commit": "dca88ad6915b65f6e037f8c3e632fcd92a70bd88", "tree": "a3dcbe53310997dcc37c7d49129c48febef53992", "parents": [ "fed474857efbed79cd390d0aee224231ca718f63", "1632b9e2a14ce9f4e08faf6c4380431d63319bd3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:03:30 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.infradead.org/users/dhowells/linux-headers\n\n* \u0027for-next\u0027 of git://git.infradead.org/users/dhowells/linux-headers:\n UAPI: Split trivial #if defined(__KERNEL__) \u0026\u0026 X conditionals\n UAPI: Don\u0027t have a #elif clause in a __KERNEL__ guard in linux/soundcard.h\n UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed\n UAPI: Make linux/patchkey.h easier to parse\n UAPI: Fix nested __KERNEL__ guards in video/edid.h\n UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter\n UAPI: Guard linux/cuda.h\n UAPI: Guard linux/pmu.h\n UAPI: Guard linux/isdn_divertif.h\n UAPI: Guard linux/sound.h\n UAPI: Rearrange definition of HZ in asm-generic/param.h\n UAPI: Make FRV use asm-generic/param.h\n UAPI: Make M32R use asm-generic/param.h\n UAPI: Make MN10300 use asm-generic/param.h\n UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace\n UAPI: Don\u0027t include linux/compat.h in sparc\u0027s asm/siginfo.h\n UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines\n" }, { "commit": "7b67e751479d50b7f84d1a3cc5216eed5e534b66", "tree": "a1a6746857cf65f04dde739fe271bf4143d55eaf", "parents": [ "9f13a1fd452f11c18004ba2422a6384b424ec8a9", "76ccc297018d25d55b789bbd508861ef1e2cdb0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:50:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:50:26 2012 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)\n x86/PCI: Expand the x86_msi_ops to have a restore MSIs.\n PCI: Increase resource array mask bit size in pcim_iomap_regions()\n PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES\n PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)\n PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB\n x86/PCI: amd: factor out MMCONFIG discovery\n PCI: Enable ATS at the device state restore\n PCI: msi: fix imbalanced refcount of msi irq sysfs objects\n PCI: kconfig: English typo in pci/pcie/Kconfig\n PCI/PM/Runtime: make PCI traces quieter\n PCI: remove pci_create_bus()\n xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources\n x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()\n x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()\n x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan\n sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources\n sparc/PCI: convert to pci_create_root_bus()\n sh/PCI: convert to pci_scan_root_bus() for correct root bus resources\n powerpc/PCI: convert to pci_create_root_bus()\n powerpc/PCI: split PHB part out of pcibios_map_io_space()\n ...\n\nFix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due\nto the same patches being applied in other branches.\n" }, { "commit": "9f13a1fd452f11c18004ba2422a6384b424ec8a9", "tree": "6aa799a5e095f8cfa03c7386e6d0a20ebda595e4", "parents": [ "024f78462c3da710642a54939888a92e28704653" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Tue Jan 10 03:04:32 2012 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 15:50:11 2012 -0800" }, "message": "cpu: Register a generic CPU device on architectures that currently do not\n\nfrv, h8300, m68k, microblaze, openrisc, score, um and xtensa currently\ndo not register a CPU device. Add the config option GENERIC_CPU_DEVICES\nwhich causes a generic CPU device to be registered for each present CPU,\nand make all these architectures select it.\n\nRichard Weinberger \u003crichard@nod.at\u003e covered UML and suggested using\nper_cpu.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e343a895a9f342f239c5e3c5ffc6c0b1707e6244", "tree": "46c81c6ae375b1f14e209b13c8ac020842807ece", "parents": [ "06792c4dde2ad143928cc95c1ba218c6269c494b", "193a667fba76b3df482cbf865228e26ee246e889" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 18:04:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 18:04:27 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n\nlib: use generic pci_iomap on all architectures\n\nMany architectures don\u0027t want to pull in iomap.c,\nso they ended up duplicating pci_iomap from that file.\nThat function isn\u0027t trivial, and we are going to modify it\nhttps://lkml.org/lkml/2011/11/14/183\nso the duplication hurts.\n\nThis reduces the scope of the problem significantly,\nby moving pci_iomap to a separate file and\nreferencing that from all architectures.\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:\n alpha: drop pci_iomap/pci_iounmap from pci-noop.c\n mn10300: switch to GENERIC_PCI_IOMAP\n mn10300: add missing __iomap markers\n frv: switch to GENERIC_PCI_IOMAP\n tile: switch to GENERIC_PCI_IOMAP\n tile: don\u0027t panic on iomap\n sparc: switch to GENERIC_PCI_IOMAP\n sh: switch to GENERIC_PCI_IOMAP\n powerpc: switch to GENERIC_PCI_IOMAP\n parisc: switch to GENERIC_PCI_IOMAP\n mips: switch to GENERIC_PCI_IOMAP\n microblaze: switch to GENERIC_PCI_IOMAP\n arm: switch to GENERIC_PCI_IOMAP\n alpha: switch to GENERIC_PCI_IOMAP\n lib: add GENERIC_PCI_IOMAP\n lib: move GENERIC_IOMAP to lib/Kconfig\n\nFix up trivial conflicts due to changes nearby in arch/{m68k,score}/Kconfig\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "e2a7965ee07360c448ffa4eb3d5ccee01c42251e", "tree": "9895ce454dc0f8c6186ddfbefd6c36dc4c08b9a3", "parents": [ "37d15909ff6bf6e97e1d4447efa7f1a19e7a508e" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri Oct 28 16:26:21 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:10:57 2012 -0800" }, "message": "frv/PCI: convert to pci_scan_root_bus() for correct root bus resources\n\nConvert from pci_scan_bus() to pci_scan_root_bus() and remove root bus\nresource fixups. This fixes the problem of \"early\" and \"header\" quirks\nseeing incorrect root bus resources.\n\nNote that peer root buses are scanned with pci_scan_bus() (which is now\ndeprecated), so they have the default ioport_resource and iomem_resource\nresources. This is unchanged from before, but these resources are\nincorrect, and I don\u0027t know how to discover the correct ones.\n\nCC: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "fcd770059a8234db7b6504aa7fe37cd9e8266e34", "tree": "cee54ccc8f2c18db3555db65aa0e691e19baf709", "parents": [ "96c5590058d7fded14f43af2ab521436cecf3125" ], "author": { "name": "Myron Stowe", "email": "mstowe@redhat.com", "time": "Fri Oct 28 15:48:45 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:10:43 2012 -0800" }, "message": "PCI: frv: use generic pcibios_set_master()\n\nThis patch removes frv\u0027s architecture-specific \u0027pcibios_set_master()\u0027\nroutine and lets the default PCI core based implementation handle PCI\ndevice \u0027latency timer\u0027 setup.\n\nNo functional change.\n\nSigned-off-by: Myron Stowe \u003cmyron.stowe@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "96c5590058d7fded14f43af2ab521436cecf3125", "tree": "673577f86b1ee8886c27cc86333fdfdc6cc783ac", "parents": [ "9cdce18d6f0baae53f012fb3f50e66e7ff24c509" ], "author": { "name": "Myron Stowe", "email": "mstowe@redhat.com", "time": "Fri Oct 28 15:48:38 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:10:42 2012 -0800" }, "message": "PCI: Pull PCI \u0027latency timer\u0027 setup up into the core\n\nThe \u0027latency timer\u0027 of PCI devices, both Type 0 and Type 1,\nis setup in architecture-specific code [see: \u0027pcibios_set_master()\u0027].\nThere are two approaches being taken by all the architectures - check\nif the \u0027latency timer\u0027 is currently set between 16 and 255 and if not\nbring it within bounds, or, do nothing (and then there is the\ngratuitously different PA-RISC implementation).\n\nThere is nothing architecture-specific about PCI\u0027s \u0027latency timer\u0027 so\nthis patch pulls its setup functionality up into the PCI core by\ncreating a generic \u0027pcibios_set_master()\u0027 function using the \u0027__weak\u0027\nattribute which can be used by all architectures as a default which,\nif necessary, can then be over-ridden by architecture-specific code.\n\nNo functional change.\n\nSigned-off-by: Myron Stowe \u003cmyron.stowe@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "84dfa9897ef913771af44484fefbe0de29fdce51", "tree": "83bd6cdaa765a0517586edc8e67458000b20b4f1", "parents": [ "93d3a10ef4fdfd4b6d1a3f09b645cd08f74a8115" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 27 14:54:36 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:18 2012 -0500" }, "message": "consolidate a bunch of ipcbuf.h instances\n\n... some still remain weird :-/\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0583fcc96bb117763c0fa74c123573c0112dec65", "tree": "5d8a62e922c34e6e6bc0836b40f5b59f69266766", "parents": [ "1bc94226d5c642b78cf6b2e3e843ef24eb740df0" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 17:04:15 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:17 2012 -0500" }, "message": "consolidate umode_t declarations\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "cb0d93505f6e9d2db87a50f402ec022517ec44c8", "tree": "9519a8e4a063e986f8c05218b0a0a1c46a73cbe6", "parents": [ "d507462c63c7423ae9b9378ed049909a646d28f7" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Dec 12 13:56:04 2011 +0000" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Dec 12 13:56:04 2011 +0000" }, "message": "UAPI: Make FRV use asm-generic/param.h\n \nMake FRV use the generic settings to be found in asm-generic/param.h where\npossible rather than defining its own as they\u0027re mostly exactly the same.\n\nThis sorts out a problem with HZ being redefined after the UAPI split.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "5322418502be4696ebdef2ed164bbd0a348d4816", "tree": "f5a2e2ea9b1988c2ed811e46573f9bb0d8630b7c", "parents": [ "845501213033d0058945776349f15502823359d8" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Tue Nov 29 21:20:06 2011 +0200" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Dec 04 16:00:12 2011 +0200" }, "message": "frv: switch to GENERIC_PCI_IOMAP\n\nfrv uses a version of pci_iomap that simply\ncasts and returns back the start address.\nLooking closely, both ioremap and ioport_map seem to\ndo this on this platform, so the generic pci_iomap\nwill DTRT automatically.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n" }, { "commit": "d88e4cb67197d007fb778d62fe17360e970d5bfa", "tree": "5307877c29d7d9f8be6699164039db26e50be457", "parents": [ "a3201227f803ad7fd43180c5195dbe5a2bf998aa" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "message": "freezer: remove now unused TIF_FREEZE\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: linux-arch@vger.kernel.org\n" }, { "commit": "e11c259f745889b55bc5596ca78271f2f5cf08d2", "tree": "5025f0bf9093e84d0643beb9097249c176dbbea7", "parents": [ "8d26784cf0d04c1238e906efdd5de76439cb0a1e", "b4487c2d0edaf1332d7a9f11b5661044955ef5e2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tinclude/net/bluetooth/bluetooth.h\n" }, { "commit": "2290c0d06d82faee87b1ab2d9d4f7bf81ef64379", "tree": "e075e4d5534193f28e6059904f61e5ca03958d3c", "parents": [ "4da669a2e3e5bc70b30a0465f3641528681b5f77", "52e4c2a05256cb83cda12f3c2137ab1533344edb" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Nov 13 20:55:35 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Nov 13 20:55:53 2011 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus tree to have 157550ff (\"mtd: add GPMI-NAND driver\nin the config and Makefile\") as I have patch depending on that one.\n" }, { "commit": "6e3e939f3b1bf8534b32ad09ff199d88800835a0", "tree": "78ec0638efbade2fdb0bebb7bad71410ded2e6c6", "parents": [ "4fdbff0770bea059621bc4906fb7c7f5879f3ae1" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Nov 09 10:15:42 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Nov 09 16:01:02 2011 -0500" }, "message": "net: add wireless TX status socket option\n\nThe 802.1X EAPOL handshake hostapd does requires\nknowing whether the frame was ack\u0027ed by the peer.\nCurrently, we fudge this pretty badly by not even\ntransmitting the frame as a normal data frame but\ninjecting it with radiotap and getting the status\nout of radiotap monitor as well. This is rather\ncomplex, confuses users (mon.wlan0 presence) and\ndoesn\u0027t work with all hardware.\n\nTo get rid of that hack, introduce a real wifi TX\nstatus option for data frame transmissions.\n\nThis works similar to the existing TX timestamping\nin that it reflects the SKB back to the socket\u0027s\nerror queue with a SCM_WIFI_STATUS cmsg that has\nan int indicating ACK status (0/1).\n\nSince it is possible that at some point we will\nwant to have TX timestamping and wifi status in a\nsingle errqueue SKB (there\u0027s little point in not\ndoing that), redefine SO_EE_ORIGIN_TIMESTAMPING\nto SO_EE_ORIGIN_TXSTATUS which can collect more\nthan just the timestamp; keep the old constant\nas an alias of course. Currently the internal APIs\ndon\u0027t make that possible, but it wouldn\u0027t be hard\nto split them up in a way that makes it possible.\n\nThanks to Neil Horman for helping me figure out\nthe functions that add the control messages.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "50e1499f468fd74c6db95deb2e1e6bfee578ae70", "tree": "0b34eb53c9b164cd2f3562cdef1207b814ac26d8", "parents": [ "55036ba76b2d2fd53b5c00993fcec5ed56e83922" ], "author": { "name": "Andy Shevchenko", "email": "andriy.shevchenko@linux.intel.com", "time": "Mon Oct 31 17:12:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:56 2011 -0700" }, "message": "kgdb: follow rename pack_hex_byte() to hex_byte_pack()\n\nThere is no functional change.\n\nSigned-off-by: Andy Shevchenko \u003candriy.shevchenko@linux.intel.com\u003e\nAcked-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3007c48a6a1bc6c7b81d5d9890bcbd5c0b519235", "tree": "57e5ebb878945574053e96d43218ceb037dcbc4b", "parents": [ "6099e419ae7e1dd44c808693bd1905d22a6db15f" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Sun Oct 23 17:23:54 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sat Oct 29 21:31:21 2011 +0200" }, "message": "treewide: remove commented out Kconfig entries\n\nThese Kconfig entries have been commented out since (at least)\nv2.6.12-rc2 (the first commit of the git repository). There\u0027s no\nindication why they\u0027re commented out. They might as well be removed.\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "f5b940997397229975ea073679b03967932a541b", "tree": "a477f440175d67b67928d6d11c845fe98f09eb72", "parents": [ "b727d20269e8ef1de002bfea8099f5e9db9e9f23" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Fri Aug 26 18:03:11 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 26 15:09:58 2011 -0700" }, "message": "All Arch: remove linkage for sys_nfsservctl system call\n\nThe nfsservctl system call is now gone, so we should remove all\nlinkage for it.\n\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d0e323b47057f4492b8fa22345f38d80a469bf8d", "tree": "feb760c7e2cdb1e43640417409428ab858910ea3", "parents": [ "c027a474a68065391c8773f6e83ed5412657e369", "c3e6088e1036f8084bc7444b38437da136b7588b" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:30:42 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:30:42 2011 -0400" }, "message": "Merge branch \u0027apei\u0027 into apei-release\n\nSome trivial conflicts due to other various merges\nadding to the end of common lists sooner than this one.\n\n\tarch/ia64/Kconfig\n\tarch/powerpc/Kconfig\n\tarch/x86/Kconfig\n\tlib/Kconfig\n\tlib/Makefile\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "df013ffb8119c89f062ab05b7f544704315db47b", "tree": "db87f30545d2fd6cf9b0a547f09d924df3be90dd", "parents": [ "9fb0bfe1408d5506b7b83d13d1eed573fd71d67d" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Wed Jul 13 13:14:22 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:12:37 2011 -0400" }, "message": "Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG\n\ncmpxchg() is widely used by lockless code, including NMI-safe lockless\ncode. But on some architectures, the cmpxchg() implementation is not\nNMI-safe, on these architectures the lockless code may need a\nspin_trylock_irqsave() based implementation.\n\nThis patch adds a Kconfig option: ARCH_HAVE_NMI_SAFE_CMPXCHG, so that\nNMI-safe lockless code can depend on it or provide different\nimplementation according to it.\n\nOn many architectures, cmpxchg is only NMI-safe for several specific\noperand sizes. So, ARCH_HAVE_NMI_SAFE_CMPXCHG define in this patch\nonly guarantees cmpxchg is NMI-safe for sizeof(unsigned long).\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nAcked-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Richard Henderson \u003crth@twiddle.net\u003e\nCC: Mikael Starvik \u003cstarvik@axis.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCC: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCC: Tony Luck \u003ctony.luck@intel.com\u003e\nCC: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCC: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCC: Michal Simek \u003cmonstr@monstr.eu\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCC: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCC: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCC: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Ingo Molnar \u003cmingo@redhat.com\u003e\nCC: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "dbfe89877741726c30efb41f0132e247a78c3681", "tree": "40511033c8fe687b232a7cde1ee1ba3dea1bc42e", "parents": [ "83c1b31794a9e3cb30edabef7e57fbdbe129c5ce" ], "author": { "name": "Greg Dietsche", "email": "Gregory.Dietsche@cuw.edu", "time": "Fri Jul 29 16:46:16 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 29 23:41:09 2011 -0700" }, "message": "frv: remove unnecessary code\n\nremove unnecessary code that matches this coccinelle pattern\n\n\tif (...)\n\t\treturn ret;\n\treturn ret;\n\nSigned-off-by: Greg Dietsche \u003cGregory.Dietsche@cuw.edu\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7847777a45f9f8bfc8617dbf107bde1ecb59caee", "tree": "f9e31828db79e607a763f1eaea2119b2f270dcdb", "parents": [ "f24219b4e90cf70ec4a211b17fbabc725a0ddf3c" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: cleanup asm-generic atomic*.h inclusion\n\nAfter changing all consumers of atomics to include \u003clinux/atomic.h\u003e, we\nran into some compile time errors due to this dependency chain:\n\nlinux/atomic.h\n -\u003e asm/atomic.h\n -\u003e asm-generic/atomic-long.h\n\nwhere atomic-long.h could use funcs defined later in linux/atomic.h\nwithout a prototype. This patches moves the code that includes\nasm-generic/atomic*.h to linux/atomic.h.\n\nArchs that need \u003casm-generic/atomic64.h\u003e need to select\nCONFIG_GENERIC_ATOMIC64 from now on (some of them used to include it\nunconditionally).\n\nCompile tested on i386 and x86_64 with allnoconfig.\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f24219b4e90cf70ec4a211b17fbabc725a0ddf3c", "tree": "c1c753bd425d61a5094995d9835b23b46383d9b2", "parents": [ "60063497a95e716c9a689af3be2687d261f115b4" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: move atomic_add_unless to generic code\n\nThis is in preparation for more generic atomic primitives based on\n__atomic_add_unless.\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed", "tree": "75cc7df62c9713bc1a44738026878a79653faa38", "parents": [ "b2c9cd3793e5878e301ec2219785a7b8ca402ef1" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Tue Jul 26 16:09:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:46 2011 -0700" }, "message": "asm-generic: add another generic ext2 atomic bitops\n\nThe majority of architectures implement ext2 atomic bitops as\ntest_and_{set,clear}_bit() without spinlock.\n\nThis adds this type of generic implementation in ext2-atomic-setbit.h and\nuse it wherever possible.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSuggested-by: Andreas Dilger \u003cadilger@dilger.ca\u003e\nSuggested-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0e9a6cb5e66f4b23e2a8f6b3f00949b7b3125dda", "tree": "f5ae8bd305b7df5f9dcb75ea86b05174c3dc5b90", "parents": [ "778d3b0ff0654ad7092bf823fd32010066b12365" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue Jul 26 16:08:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:43 2011 -0700" }, "message": "ptrace: unify show_regs() prototype\n\n[ poleg@redhat.com: no need to declare show_regs() in ptrace.h, sched.h does this ]\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "adc400f69053b16756ff3b00daa64884c8df0787", "tree": "e1217453e0aba0aed1adfec0bfba9baf611dd334", "parents": [ "6fd4ce886440c7a1b08b6642e606ee19097829df" ], "author": { "name": "Mathias Krause", "email": "minipli@googlemail.com", "time": "Tue Jul 26 16:08:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:41 2011 -0700" }, "message": "frv, exec: remove redundant set_fs(USER_DS)\n\nThe address limit is already set in flush_old_exec() so those calls to\nset_fs(USER_DS) are redundant.\n\nAlso removed the dead code in flush_thread().\n\nSigned-off-by: Mathias Krause \u003cminipli@googlemail.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "66574cc05438dd0907029075d7e6ec5ac0036fbc", "tree": "8516792e486a535840e09b67f0831c303df3d45d", "parents": [ "74e08fcf7bef973512a1f813700f802a93678670" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Thu Jun 30 21:22:12 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Sun Jul 24 22:06:04 2011 +0930" }, "message": "modules: make arch\u0027s use default loader hooks\n\nThis patch removes all the module loader hook implementations in the\narchitecture specific code where the functionality is the same as that\nnow provided by the recently added default hooks.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "571503e10045c89af951962ea0bb783482663aad", "tree": "b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a", "parents": [ "29a6ccca3869bbe33879dae0cd7df2a1559eff54", "7b21fddd087678a70ad64afc0f632e0f1071b092" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:51:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:51:01 2011 -0700" }, "message": "Merge branch \u0027setns\u0027\n\n* setns:\n ns: Wire up the setns system call\n\nDone as a merge to make it easier to fix up conflicts in arm due to\naddition of sendmmsg system call\n" }, { "commit": "7b21fddd087678a70ad64afc0f632e0f1071b092", "tree": "c3ee152ab9b57b6cbc1ee3c6fd495c704ec47f66", "parents": [ "14d74e0cab7a7779a7ff0c3863c04c8a8e507106" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri May 27 19:28:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:48:39 2011 -0700" }, "message": "ns: Wire up the setns system call\n\n32bit and 64bit on x86 are tested and working. The rest I have looked\nat closely and I can\u0027t find any problems.\n\nsetns is an easy system call to wire up. It just takes two ints so I\ndon\u0027t expect any weird architecture porting problems.\n\nWhile doing this I have noticed that we have some architectures that are\nvery slow to get new system calls. cris seems to be the slowest where\nthe last system calls wired up were preadv and pwritev. avr32 is weird\nin that recvmmsg was wired up but never declared in unistd.h. frv is\nbehind with perf_event_open being the last syscall wired up. On h8300\nthe last system call wired up was epoll_wait. On m32r the last system\ncall wired up was fallocate. mn10300 has recvmmsg as the last system\ncall wired up. The rest seem to at least have syncfs wired up which was\nnew in the 2.6.39.\n\nv2: Most of the architecture support added by Daniel Lezcano \u003cdlezcano@fr.ibm.com\u003e\nv3: ported to v2.6.36-rc4 by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nv4: Moved wiring up of the system call to another patch\nv5: ported to v2.6.39-rc6\nv6: rebased onto parisc-next and net-next to avoid syscall conflicts.\nv7: ported to Linus\u0027s latest post 2.6.39 tree.\n\n\u003e  arch/blackfin/include/asm/unistd.h     |    3 ++-\n\u003e  arch/blackfin/mach-common/entry.S      |    1 +\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\n\nOh - ia64 wiring looks good.\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f23a5e1405e47df6cdc86568ea75df266b9e151f", "tree": "788fab831a235ce8f143e8562d832336a595cff7", "parents": [ "d24c2af42292cb4ad9c829d71fe0d795112ca6e7", "0775a60aca2375ea5598741b30d13fe6d3f15617" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 14:27:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 14:27:34 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PM: Fix PM QOS\u0027s user mode interface to work with ASCII input\n PM / Hibernate: Update kerneldoc comments in hibernate.c\n PM / Hibernate: Remove arch_prepare_suspend()\n PM / Hibernate: Update some comments in core hibernate code\n" }, { "commit": "63e424c84429903c92a0f1e9654c31ccaf6694d0", "tree": "7a5dbe2587176f3552a71aa18d4cc006bc05261b", "parents": [ "19de85ef574c3a2182e3ccad9581805052f14946" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Thu May 26 16:26:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:38 2011 -0700" }, "message": "arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT}\n\nBy the previous style change, CONFIG_GENERIC_FIND_NEXT_BIT,\nCONFIG_GENERIC_FIND_BIT_LE, and CONFIG_GENERIC_FIND_LAST_BIT are not used\nto test for existence of find bitops anymore.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1c395176962176660bb108f90e97e1686cfe0d85", "tree": "dc3b91d8d0d9b00a59f26677cce0f9eb90b1772f", "parents": [ "ff075d605511784c79cbf0ae73d90e07238267b3" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue May 24 17:11:58 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:16 2011 -0700" }, "message": "mm: now that all old mmu_gather code is gone, remove the storage\n\nFold all the mmu_gather rework patches into one for submission\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReported-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Richard Weinberger \u003crichard@nod.at\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "354258011e8e86961f7a72ad154ca8caf0c4c6f7", "tree": "e1c680e692a9cdddaabece1fe73dd85928bd1b23", "parents": [ "4e2d9491a78929badcf774869b458486acb96365" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 23:35:55 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 23:35:55 2011 +0200" }, "message": "PM / Hibernate: Remove arch_prepare_suspend()\n\nAll architectures supporting hibernation define\narch_prepare_suspend() as an empty function, so remove it.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f", "tree": "799e309a7db032cb7abe9f0fa910c2989c3fdab5", "parents": [ "4d429480352c63db2228489f0db9fd381cdc3c9c", "6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:53:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 11:53:42 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-2.6.40\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: Unify input section names\n percpu: Avoid extra NOP in percpu_cmpxchg16b_double\n percpu: Cast away printk format warning\n percpu: Always align percpu output section to PAGE_SIZE\n\nFix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "78c89825649a9a5ed526c507603196f467d781a5", "tree": "eb2485baf085f7a6820c6b9030dfa3d733591aa3", "parents": [ "e282326600f31ab38d8814fd6deb277a48850c35" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Mar 30 14:13:23 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Mar 30 14:13:23 2011 +0200" }, "message": "genirq: Remove the now obsolete config options and select statements\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "3062aa50a6b2c3103470178fe7506c450d79ebe5", "tree": "0ebeb6b8a3bbae294892c73b96c2ec6175b1ff39", "parents": [ "60af3ab1e6b0b7a1bdbb7392134c27e6be9630df" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "FRV: Use generic show_interrupts()\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "60af3ab1e6b0b7a1bdbb7392134c27e6be9630df", "tree": "21a55b8c9bc64fc099ab2136df9db70d044f5ca8", "parents": [ "a9554c3a5d02d50aeff08203ca8dd1e2dffdaa0d" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "FRV: Convert genirq namespace\n\nConvert to new function names. Converted with coccinelle.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "a9554c3a5d02d50aeff08203ca8dd1e2dffdaa0d", "tree": "06a7b5091db007083cd2991d73dde622c3dff474", "parents": [ "12516469756f773ac756ac73c4070ba8efef155a" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "frv: Select GENERIC_HARDIRQS_NO_DEPRECATED\n\nAll chips converted\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "12516469756f773ac756ac73c4070ba8efef155a", "tree": "4a6ada44bc497191f56701146df4d4589e45a350", "parents": [ "a4b48a494aef7ab2458b365e00eeebc6c0a2d997" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "frv: Convert cpu irq_chip to new functions\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "a4b48a494aef7ab2458b365e00eeebc6c0a2d997", "tree": "018822fc391adb6a2d1015002af2672e5b8afe80", "parents": [ "9148d88b120d260aa64fb21faaf18aa7a46b18a4" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "frv: Convert mb93493 irq_chip to new functions\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "9148d88b120d260aa64fb21faaf18aa7a46b18a4", "tree": "33bb7dbd1d68c81c90d7fcb7bb9f80de54211100", "parents": [ "193e7a5f824b54386621df9303053c36ed0d9c16" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "frv: Convert mb93093 irq_chip to new function\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "193e7a5f824b54386621df9303053c36ed0d9c16", "tree": "a351a92f4ce624e265afa76cb06d20ea57336af8", "parents": [ "303fef9052d90257df3e0e434b834af3938b8a7f" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "frv: Convert mb93091 irq_chip to new functions\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "303fef9052d90257df3e0e434b834af3938b8a7f", "tree": "b0813c74764ed1146cb6c58ecbb556e9760dfcb5", "parents": [ "c4b159802306c07692324f9aa277e6ed144811e3" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:13 2011 +0100" }, "message": "frv: Fix typo from __do_IRQ overhaul\n\nCompiles way better.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "c4b159802306c07692324f9aa277e6ed144811e3", "tree": "8c5e81de0cae68e9dfce2b0d107d918aa1648a63", "parents": [ "5ca7202bc4db3e2fd5653c52a608601c7a64a2ac" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 29 14:05:12 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:12 2011 +0100" }, "message": "frv: Remove stale irq_chip.end\n\nirq_chip.end got obsolete with the removal of __do_IRQ().\n\nirq-mb93093.c even lacks an implementation, but nobody noticed that\nit\u0027s broken since commit 88d6e1 in 2006.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "5ca7202bc4db3e2fd5653c52a608601c7a64a2ac", "tree": "d252f9bbb5d026912ff7a6591b7815334da9990c", "parents": [ "5ef9bdde9cd8e7f9d43a975b47f520ca64cbd0a1" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Tue Mar 29 14:05:12 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:12 2011 +0100" }, "message": "FRV: Do some cleanups\n\n1. frv doesn\u0027t support SMP, remove the useless SMP bits.\n\n2. frv has its own alloc_task_struct, so define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR\n (I am not sure if frv should use generic alloc_task_struct().)\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "5ef9bdde9cd8e7f9d43a975b47f520ca64cbd0a1", "tree": "774a13f78efc0fa9d8f642082caf183781c6bcd7", "parents": [ "f55f199b7d76a01e7ce9d1c3bb004327e075c327" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:12 2011 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 29 14:05:12 2011 +0100" }, "message": "FRV: Missing node arg in alloc_thread_info_node() macro\n\nThere are two alloc_thread_info_node() macros defined (one for debugging and\none for normal). The commit that changed them most recently:\n\n\tcommit b6a84016bd2598e35ead635147fa53619982648d\n\tAuthor: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n\tDate: Tue Mar 22 16:30:42 2011 -0700\n\tSubject: mm: NUMA aware alloc_thread_info_node()\n\ndidn\u0027t add the node argument into the macro argument list for the normal macro.\nThis results in the following error:\n\nkernel/fork.c:267:39: error: macro \"alloc_thread_info_node\" passed 2 arguments, but takes just 1\nkernel/fork.c: In function \u0027dup_task_struct\u0027:\nkernel/fork.c:267: error: \u0027alloc_thread_info_node\u0027 undeclared (first use in this function)\nkernel/fork.c:267: error: (Each undeclared identifier is reported only once\nkernel/fork.c:267: error: for each function it appears in.)\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "0415b00d175e0d8945e6785aad21b5f157976ce0", "tree": "cf6f9286a47a22bf57766a3f17eaf4190bc9c242", "parents": [ "6c5103890057b1bb781b26b7aae38d33e4c517d8" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Mar 24 18:50:09 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Mar 24 18:50:09 2011 +0100" }, "message": "percpu: Always align percpu output section to PAGE_SIZE\n\nPercpu allocator honors alignment request upto PAGE_SIZE and both the\npercpu addresses in the percpu address space and the translated kernel\naddresses should be aligned accordingly. The calculation of the\nformer depends on the alignment of percpu output section in the kernel\nimage.\n\nThe linker script macros PERCPU_VADDR() and PERCPU() are used to\ndefine this output section and the latter takes @align parameter.\nSeveral architectures are using @align smaller than PAGE_SIZE breaking\npercpu memory alignment.\n\nThis patch removes @align parameter from PERCPU(), renames it to\nPERCPU_SECTION() and makes it always align to PAGE_SIZE. While at it,\nadd PCPU_SETUP_BUG_ON() checks such that alignment problems are\nreliably detected and remove percpu alignment comment recently added\nin workqueue.c as the condition would trigger BUG way before reaching\nthere.\n\nFor um, this patch raises the alignment of percpu area. As the area\nis in .init, there shouldn\u0027t be any noticeable difference.\n\nThis problem was discovered by David Howells while debugging boot\nfailure on mn10300.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: uclinux-dist-devel@blackfin.uclinux.org\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: user-mode-linux-devel@lists.sourceforge.net\n" }, { "commit": "61f2e7b0f474225b4226772830ae4b29a3a21f8d", "tree": "52f880fe6feec8efe5e5e028a3e0637629a500b7", "parents": [ "3fca5af7860f87eb2cd706c2d7dda4ad03230a07" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed Mar 23 16:42:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:46:22 2011 -0700" }, "message": "bitops: remove minix bitops from asm/bitops.h\n\nminix bit operations are only used by minix filesystem and useless by\nother modules. Because byte order of inode and block bitmaps is different\non each architecture like below:\n\nm68k:\n\tbig-endian 16bit indexed bitmaps\n\nh8300, microblaze, s390, sparc, m68knommu:\n\tbig-endian 32 or 64bit indexed bitmaps\n\nm32r, mips, sh, xtensa:\n\tbig-endian 32 or 64bit indexed bitmaps for big-endian mode\n\tlittle-endian bitmaps for little-endian mode\n\nOthers:\n\tlittle-endian bitmaps\n\nIn order to move minix bit operations from asm/bitops.h to architecture\nindependent code in minix filesystem, this provides two config options.\n\nCONFIG_MINIX_FS_BIG_ENDIAN_16BIT_INDEXED is only selected by m68k.\nCONFIG_MINIX_FS_NATIVE_ENDIAN is selected by the architectures which use\nnative byte order bitmaps (h8300, microblaze, s390, sparc, m68knommu,\nm32r, mips, sh, xtensa). The architectures which always use little-endian\nbitmaps do not select these options.\n\nFinally, we can remove minix bit operations from asm/bitops.h for all\narchitectures.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f312eff8164879e04923d41e9dd23e7850937d85", "tree": "9f4f6fd00ebf12afd5b070c44d12b55a29440360", "parents": [ "bb5cda3d706f44e5696533c9a7353c458f2871e0" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed Mar 23 16:42:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:46:21 2011 -0700" }, "message": "bitops: remove ext2 non-atomic bitops from asm/bitops.h\n\nAs the result of conversions, there are no users of ext2 non-atomic bit\noperations except for ext2 filesystem itself. Now we can put them into\narchitecture independent code in ext2 filesystem, and remove from\nasm/bitops.h for all architectures.\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "861b5ae7cde96ca081914e21dedfa7e8a38da622", "tree": "376cae55475cce2bb45b96213b1f91b330db0448", "parents": [ "c1e6ca7a501f0139e5ec2a01f8420eeb21c97a52" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed Mar 23 16:42:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:46:15 2011 -0700" }, "message": "bitops: introduce little-endian bitops for most architectures\n\nIntroduce little-endian bit operations to the big-endian architectures\nwhich do not have native little-endian bit operations and the\nlittle-endian architectures. (alpha, avr32, blackfin, cris, frv, h8300,\nia64, m32r, mips, mn10300, parisc, sh, sparc, tile, x86, xtensa)\n\nThese architectures can just include generic implementation\n(asm-generic/bitops/le.h).\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Matthew Wilcox \u003cwilly@debian.org\u003e\nCc: Grant Grundler \u003cgrundler@parisc-linux.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Kazumoto Kojima \u003ckkojima@rr.iij4u.or.jp\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0664996b7c2fdb1b7f90954469cc242274abd7db", "tree": "21bcf25afb94791f87fc5aa8c7e79ac1a8845ad8", "parents": [ "3f5527fe7e0fb50556b97b8addbe3832985f793e" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Wed Mar 23 16:41:59 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:46:14 2011 -0700" }, "message": "bitops: introduce CONFIG_GENERIC_FIND_BIT_LE\n\nThis introduces CONFIG_GENERIC_FIND_BIT_LE to tell whether to use generic\nimplementation of find_*_bit_le() in lib/find_next_bit.c or not.\n\nFor now we select CONFIG_GENERIC_FIND_BIT_LE for all architectures which\nenable CONFIG_GENERIC_FIND_NEXT_BIT.\n\nBut m68knommu wants to define own faster find_next_zero_bit_le() and\ncontinues using generic find_next_{,zero_}bit().\n(CONFIG_GENERIC_FIND_NEXT_BIT and !CONFIG_GENERIC_FIND_BIT_LE)\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3e50594e8e72932ad4cfcb0b3cbdf58fc3bce416", "tree": "c33044290a9161e73ac5eded5d10a27c47bbfd5f", "parents": [ "8a06dc4d52458e4a909b652ee9fe8f82d2cd87a2" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Mar 22 16:33:50 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:09 2011 -0700" }, "message": "add the common dma_addr_t typedef to include/linux/types.h\n\nAll architectures can use the common dma_addr_t typedef now. We can\nremove the arch specific dma_addr_t.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b6a84016bd2598e35ead635147fa53619982648d", "tree": "a73dc0ef4e353723bf123898f0fc143e587c16d8", "parents": [ "504f52b5439aaf26d3e2c1d45ec10fce38c8dd27" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Mar 22 16:30:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:01 2011 -0700" }, "message": "mm: NUMA aware alloc_thread_info_node()\n\nAdd a node parameter to alloc_thread_info(), and change its name to\nalloc_thread_info_node()\n\nThis change is needed to allow NUMA aware kthread_create_on_cpu()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nReviewed-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "504f52b5439aaf26d3e2c1d45ec10fce38c8dd27", "tree": "cb46d72c50e843c36540c88ef8c9000dff31c1c8", "parents": [ "9d502c1c8d47b337c378c2ac8eaeee7918ad16b1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Mar 22 16:30:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:01 2011 -0700" }, "message": "mm: NUMA aware alloc_task_struct_node()\n\nAll kthreads being created from a single helper task, they all use memory\nfrom a single node for their kernel stack and task struct.\n\nThis patch suite creates kthread_create_on_cpu(), adding a \u0027cpu\u0027 parameter\nto parameters already used by kthread_create().\n\nThis parameter serves in allocating memory for the new kthread on its\nmemory node if available.\n\nUsers of this new function are : ksoftirqd, kworker, migration, pktgend...\n\nThis patch:\n\nAdd a node parameter to alloc_task_struct(), and change its name to\nalloc_task_struct_node()\n\nThis change is needed to allow NUMA aware kthread_create_on_cpu()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nReviewed-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "79d8a8f736151b12129984b1250fd708440e742c", "tree": "f67eebe2bafca8820955ee9f851985a41fb32e66", "parents": [ "bd2895eeade5f11f3e5906283c630bbdb4b57454", "b9ec40af0e18fb7d02106be148036c2ea490fdf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:22:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 08:22:41 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-2.6.39\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu, x86: Add arch-specific this_cpu_cmpxchg_double() support\n percpu: Generic support for this_cpu_cmpxchg_double()\n alpha: use L1_CACHE_BYTES for cacheline size in the linker script\n percpu: align percpu readmostly subsection to cacheline\n\nFix up trivial conflict in arch/x86/kernel/vmlinux.lds.S due to the\npercpu alignment having changed (\"x86: Reduce back the alignment of the\nper-CPU data section\")\n" }, { "commit": "420c1c572d4ceaa2f37b6311b7017ac6cf049fe2", "tree": "df04e6b4b756b7a46d9887462d54a3ad0e1f91d5", "parents": [ "9620639b7ea3843983f4ced8b4c81eb4d8974838", "6e6823d17b157f185be09f4c70181299f9273f0b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 18:53:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 18:53:35 2011 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits)\n posix-clocks: Check write permissions in posix syscalls\n hrtimer: Remove empty hrtimer_init_hres_timer()\n hrtimer: Update hrtimer-\u003estate documentation\n hrtimer: Update base[CLOCK_BOOTTIME].offset correctly\n timers: Export CLOCK_BOOTTIME via the posix timers interface\n timers: Add CLOCK_BOOTTIME hrtimer base\n time: Extend get_xtime_and_monotonic_offset() to also return sleep\n time: Introduce get_monotonic_boottime and ktime_get_boottime\n hrtimers: extend hrtimer base code to handle more then 2 clockids\n ntp: Remove redundant and incorrect parameter check\n mn10300: Switch do_timer() to xtimer_update()\n posix clocks: Introduce dynamic clocks\n posix-timers: Cleanup namespace\n posix-timers: Add support for fd based clocks\n x86: Add clock_adjtime for x86\n posix-timers: Introduce a syscall for clock tuning.\n time: Splitout compat timex accessors\n ntp: Add ADJ_SETOFFSET mode bit\n time: Introduce timekeeping_inject_offset\n posix-timer: Update comment\n ...\n\nFix up new system-call-related conflicts in\n\tarch/x86/ia32/ia32entry.S\n\tarch/x86/include/asm/unistd_32.h\n\tarch/x86/include/asm/unistd_64.h\n\tarch/x86/kernel/syscall_table_32.S\n(name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some\ndue to movement of get_jiffies_64() in:\n\tkernel/time.c\n" }, { "commit": "8d7718aa082aaf30a0b4989e1f04858952f941bc", "tree": "f006a565d138cec2b497c2bd619f570ad1a11f6e", "parents": [ "37a9d912b24f96a0591773e6e6c3642991ae5a70" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Thu Mar 10 18:50:58 2011 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Mar 11 12:23:31 2011 +0100" }, "message": "futex: Sanitize futex ops argument types\n\nChange futex_atomic_op_inuser and futex_atomic_cmpxchg_inatomic\nprototypes to use u32 types for the futex as this is the data type the\nfutex core code uses all over the place.\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Darren Hart \u003cdarren@dvhart.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003c20110311025058.GD26122@google.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "37a9d912b24f96a0591773e6e6c3642991ae5a70", "tree": "5c4d5b9a52e2c533269e589115afbd25b6c8534b", "parents": [ "522d7decc0370070448a8c28982c8dfd8970489e" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Thu Mar 10 18:48:51 2011 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Mar 11 12:23:08 2011 +0100" }, "message": "futex: Sanitize cmpxchg_futex_value_locked API\n\nThe cmpxchg_futex_value_locked API was funny in that it returned either\nthe original, user-exposed futex value OR an error code such as -EFAULT.\nThis was confusing at best, and could be a source of livelocks in places\nthat retry the cmpxchg_futex_value_locked after trying to fix the issue\nby running fault_in_user_writeable().\n \nThis change makes the cmpxchg_futex_value_locked API more similar to the\nget_futex_value_locked one, returning an error code and updating the\noriginal value through a reference argument.\n \nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e [tile]\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e [ia64]\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e [microblaze]\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e [frv]\nCc: Darren Hart \u003cdarren@dvhart.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003c20110311024851.GC26122@google.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "57464bd87f708e75b47312766e3fc8dc3aaf66ad", "tree": "05047f5add674428289a12d7a912a3bf129c9e67", "parents": [ "36cb07bb8118cb14211ef25c58026f005877c47d" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Jan 27 15:59:46 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 14:55:45 2011 +0100" }, "message": "frv: Switch do_timer() to xtime_update()\n\n__set_LEDS() does not need to be protected by xtime_lock.\nits used unprotected in other places.\n\n[ tglx: Removed stale comment ]\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: hch@infradead.org\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: yong.zhang0@gmail.com\nLKML-Reference: \u003c20110127145946.23248.57952.stgit@localhost\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "19df0c2fef010e94e90df514aaf4e73f6b80145c", "tree": "4b0b9c10622aead0d8b658cca6c49090149a91a8", "parents": [ "c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 25 14:26:50 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 25 14:26:50 2011 +0100" }, "message": "percpu: align percpu readmostly subsection to cacheline\n\nCurrently percpu readmostly subsection may share cachelines with other\npercpu subsections which may result in unnecessary cacheline bounce\nand performance degradation.\n\nThis patch adds @cacheline parameter to PERCPU() and PERCPU_VADDR()\nlinker macros, makes each arch linker scripts specify its cacheline\nsize and use it to align percpu subsections.\n\nThis is based on Shaohua\u0027s x86 only patch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Shaohua Li \u003cshaohua.li@intel.com\u003e\n" }, { "commit": "f39b02d6f9af8c942961ef32c2bbce6cb6100c29", "tree": "864a2aea46f2b95d61f60c7a32062341e151258c", "parents": [ "7b0288634921c748dfeb2ff3e7d04ae7cc94e795" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jan 19 20:32:04 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jan 21 11:55:32 2011 +0100" }, "message": "frv: Use generic irq Kconfig\n\nNo functional change.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "1c77ff22f539ceaa64ea43d6a26d867e84602cb7", "tree": "d1623ae6a2f8ed56acbaa03b514e393496c42802", "parents": [ "0e155b2ce293382730b8473f6ceeb7ac9b939b7d" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jan 19 19:41:35 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jan 21 11:55:31 2011 +0100" }, "message": "genirq: Remove __do_IRQ\n\nAll architectures are finally converted. Remove the cruft.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Greg Ungerer \u003cgerg@uclinux.org\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "451a3c24b0135bce54542009b5fde43846c7cf67", "tree": "f0fbbcc155aef2a1ffcb8aa593fe7a966d0e6900", "parents": [ "55f6561c6941713ab5ae9180525b026dd40b7d14" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 17 16:26:55 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 08:59:32 2010 -0800" }, "message": "BKL: remove extraneous #include \u003csmp_lock.h\u003e\n\nThe big kernel lock has been removed from all these files at some point,\nleaving only the #include.\n\nRemove this too as a cleanup.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "51399a391940e676877c7a791138081f13a0bab7", "tree": "6caefb858ee4b31172b85ec7bcedb826a29a551b", "parents": [ "b779b332d0e1ef68f40867948ae5526a3e925163", "df4d303647ebe5e2f7e473e32ccef9f8549e9d45" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 28 16:16:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 28 16:16:39 2010 -0700" }, "message": "Merge branch \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)\n kbuild: convert `arch/tile\u0027 to the kconfig mainmenu upgrade\n README: cite nconfig\n Revert \"kconfig: Temporarily disable dependency warnings\"\n kconfig: Use PATH_MAX instead of 128 for path buffer sizes.\n kconfig: Fix realloc usage()\n kconfig: Propagate const\n kconfig: Don\u0027t go out from read config loop when you read new symbol\n kconfig: fix menuconfig on debian lenny\n kbuild: migrate all arch to the kconfig mainmenu upgrade\n kconfig: expand file names\n kconfig: use the file\u0027s name of sourced file\n kconfig: constify file name\n kconfig: don\u0027t emit warning upon rootmenu\u0027s prompt redefinition\n kconfig: replace KERNELVERSION usage by the mainmenu\u0027s prompt\n kconfig: delay gconf window initialization\n kconfig: expand by default the rootmenu\u0027s prompt\n kconfig: add a symbol string expansion helper\n kconfig: regen parser\n kconfig: implement the `mainmenu\u0027 directive\n kconfig: allow PACKAGE to be defined on the compiler\u0027s command-line\n ...\n\nFix up trivial conflict in arch/mn10300/Kconfig\n" }, { "commit": "81d3285c96dd90044ffe2c2c5d56405a5423d753", "tree": "4b592e4d2f4d51b3a89a95d77bebb0fbc77133ab", "parents": [ "475a4b813816fe9af4cdf7833799036b679f46d0" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Wed Oct 27 15:33:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:10 2010 -0700" }, "message": "ptrace: cleanup arch_ptrace() on frv\n\nUse new \u0027regno\u0027, \u0027datap\u0027 variables in order to remove duplicated\nexpressions and unnecessary castings. Alse remove checking @addr\nless than 0 because addr is now unsigned.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: \"Daniel K.\" \u003cdk@uw.no\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9b05a69e0534ec70bc94921936ffa05b330507cb", "tree": "4116a7b7db286edf9486a29a7742d47fa67baa68", "parents": [ "9fed81dc40f5a1ac2783bcc78d4029873be72894" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Wed Oct 27 15:33:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:10 2010 -0700" }, "message": "ptrace: change signature of arch_ptrace()\n\nFix up the arguments to arch_ptrace() to take account of the fact that\n@addr and @data are now unsigned long rather than long as of a preceding\npatch in this series.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20273941f2129aa5a432796d98a276ed73d60782", "tree": "85da0d951ac10f239f81ad7f69559fdeb692095b", "parents": [ "a8e23a291852cd7c4fb5ca696dbb93912185ad10" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Oct 27 15:32:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:05 2010 -0700" }, "message": "mm: fix race in kunmap_atomic()\n\nChristoph reported a nice splat which illustrated a race in the new stack\nbased kmap_atomic implementation.\n\nThe problem is that we pop our stack slot before we\u0027re completely done\nresetting its state -- in particular clearing the PTE (sometimes that\u0027s\nCONFIG_DEBUG_HIGHMEM). If an interrupt happens before we actually clear\nthe PTE used for the last slot, that interrupt can reuse the slot in a\ndirty state, which triggers a BUG in kmap_atomic().\n\nFix this by introducing kmap_atomic_idx() which reports the current slot\nindex without actually releasing it and use that to find the PTE and delay\nthe _pop() until after we\u0027re completely done.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReported-by: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ece0e2b6406a995c371e0311190631ea34ad851a", "tree": "726a516a91f5f7efe9dbb247ba28d019981d456e", "parents": [ "3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Oct 26 14:21:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:08 2010 -0700" }, "message": "mm: remove pte_*map_nested()\n\nSince we no longer need to provide KM_type, the whole pte_*map_nested()\nAPI is now redundant, remove it.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73", "tree": "2ce507f7ec7275563653e52f18606aba4f99b7f1", "parents": [ "61ecdb801ef2cd28e32442383106d7837d76deac" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Oct 26 14:21:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:08 2010 -0700" }, "message": "mm: stack based kmap_atomic()\n\nKeep the current interface but ignore the KM_type and use a stack based\napproach.\n\nThe advantage is that we get rid of crappy code like:\n\n\t#define __KM_PTE\t\t\t\\\n\t\t(in_nmi() ? KM_NMI_PTE : \t\\\n\t\t in_irq() ? KM_IRQ_PTE :\t\\\n\t\t KM_PTE0)\n\nand in general can stop worrying about what context we\u0027re in and what kmap\nslots might be appropriate for that.\n\nThe downside is that FRV kmap_atomic() gets more expensive.\n\nFor now we use a CPP trick suggested by Andrew:\n\n #define kmap_atomic(page, args...) __kmap_atomic(page)\n\nto avoid having to touch all kmap_atomic() users in a single patch.\n\n[ not compiled on:\n - mn10300: the arch doesn\u0027t actually build with highmem to begin with ]\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: fix up drivers/gpu/drm/i915/intel_overlay.c]\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "73ecf3a6e3f0206bf56a0fefe3b3eda042fb7034", "tree": "866f0ebb2b148479e93b5ac955097b1cc94ceb4e", "parents": [ "b9da0571050c09863e59f94d0b8594a290d61b88", "cd3ecad19aea8debae9a48b53de2ec7a571f24e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 19:59:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 19:59:04 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (49 commits)\n serial8250: ratelimit \"too much work\" error\n serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster\n serial: abstraction for 8250 legacy ports\n serial/imx: check that the buffer is non-empty before sending it out\n serial: mfd: add more baud rates support\n jsm: Remove the uart port on errors\n Alchemy: Add UART PM methods.\n 8250: allow platforms to override PM hook.\n altera_uart: Don\u0027t use plain integer as NULL pointer\n altera_uart: Fix missing prototype for registering an early console\n altera_uart: Fixup type usage of port flags\n altera_uart: Make it possible to use Altera UART and 8250 ports together\n altera_uart: Add support for different address strides\n altera_uart: Add support for getting mapbase and IRQ from resources\n altera_uart: Add support for polling mode (IRQ-less)\n serial: Factor out uart_poll_timeout() from 8250 driver\n serial: mark the 8250 driver as maintained\n serial: 8250: Don\u0027t delay after transmitter is ready.\n tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver\n vcs: invoke the vt update callback when /dev/vcs* is written to\n ...\n" }, { "commit": "4735d234954342b8f0f6cb20ce9aa35ffe83e712", "tree": "b61255bac8d6653c587fe3536ada6184d84e7289", "parents": [ "8bc3372d9e57db3c65cf00cea6cf14969875b055" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Fri Aug 20 17:14:05 2010 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Oct 22 10:20:00 2010 -0700" }, "message": "ioctl: Use asm-generic/ioctls.h on frv (enables termiox)\n\nThis patch converts frv to use asm-generic/ioctls.h instead of its\nown version.\n\nThe differences between the arch-specific version and the generic\nversion are as follows:\n\n- FRV defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it\n- FRV defines TIOCTTYGSTRUCT, kept in arch-specific version\n- The generic version provides TIOCGRS485 and TIOCSRS485 but they\n are unused by any driver available for this architecture.\n- The generic version adds support for termiox\n\nCc: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e36f561a2c88394ef2708f1ab300fe8a79e9f651", "tree": "385f378c4240955e4356d49686a8ef606a82a7c1", "parents": [ "70ada77920723fbc2b35e9b301022fb1e166b41b", "df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 14:37:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 14:37:27 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:\n Fix IRQ flag handling naming\n MIPS: Add missing #inclusions of \u003clinux/irq.h\u003e\n smc91x: Add missing #inclusion of \u003clinux/irq.h\u003e\n Drop a couple of unnecessary asm/system.h inclusions\n SH: Add missing consts to sys_execve() declaration\n Blackfin: Rename IRQ flags handling functions\n Blackfin: Add missing dep to asm/irqflags.h\n Blackfin: Rename DES PC2() symbol to avoid collision\n Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header\n Blackfin: Split PLL code from mach-specific cdef headers\n" }, { "commit": "e360adbe29241a0194e10e20595360dd7b98a2b3", "tree": "ef5fa5f50a895096bfb25bc11b25949603158238", "parents": [ "8e5fc1a7320baf6076391607515dceb61319b36a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Oct 14 14:01:34 2010 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Oct 18 19:58:50 2010 +0200" }, "message": "irq_work: Add generic hardirq context callbacks\n\nProvide a mechanism that allows running code in IRQ context. It is\nmost useful for NMI code that needs to interact with the rest of the\nsystem -- like wakeup a task to drain buffers.\n\nPerf currently has such a mechanism, so extract that and provide it as\na generic feature, independent of perf so that others may also\nbenefit.\n\nThe IRQ context callback is generated through self-IPIs where\npossible, or on architectures like powerpc the decrementer (the\nbuilt-in timer facility) is set to generate an interrupt immediately.\n\nArchitectures that don\u0027t have anything like this get to do with a\ncallback from the timer tick. These architectures can call\nirq_work_run() at the tail of any IRQ handlers that might enqueue such\nwork (like the perf IRQ handler) to avoid undue latencies in\nprocessing the work.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n[ various fixes ]\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nLKML-Reference: \u003c1287036094.7768.291.camel@yhuang-dev\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "239060b93bb30a4ad55f1ecaa512464a035cc5ba", "tree": "77f79810e57d4fc24356eca0cd6db463e8994128", "parents": [ "1408b15b98635a13bad2e2a50b3c2ae2ccdf625b", "e9203c988234aa512bd45ca32b52e21c7bbfc414" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Tue Oct 12 15:09:06 2010 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Tue Oct 12 15:09:06 2010 +0200" }, "message": "Merge branch \u0027kbuild/rc-fixes\u0027 into kbuild/kconfig\n\nWe need to revert the temporary hack in 71ebc01, hence the merge.\n" }, { "commit": "df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101", "tree": "0c9a87ef1ea042c4432f122c3d03614d21156fc1", "parents": [ "ca4d3e6746bdcfccb517349bce2d2c5b5614fb6f" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 07 14:08:55 2010 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 07 14:08:55 2010 +0100" }, "message": "Fix IRQ flag handling naming\n\nFix the IRQ flag handling naming. In linux/irqflags.h under one configuration,\nit maps:\n\n\tlocal_irq_enable() -\u003e raw_local_irq_enable()\n\tlocal_irq_disable() -\u003e raw_local_irq_disable()\n\tlocal_irq_save() -\u003e raw_local_irq_save()\n\t...\n\nand under the other configuration, it maps:\n\n\traw_local_irq_enable() -\u003e local_irq_enable()\n\traw_local_irq_disable() -\u003e local_irq_disable()\n\traw_local_irq_save() -\u003e local_irq_save()\n\t...\n\nThis is quite confusing. There should be one set of names expected of the\narch, and this should be wrapped to give another set of names that are expected\nby users of this facility.\n\nChange this to have the arch provide:\n\n\tflags \u003d arch_local_save_flags()\n\tflags \u003d arch_local_irq_save()\n\tarch_local_irq_restore(flags)\n\tarch_local_irq_disable()\n\tarch_local_irq_enable()\n\tarch_irqs_disabled_flags(flags)\n\tarch_irqs_disabled()\n\tarch_safe_halt()\n\nThen linux/irqflags.h wraps these to provide:\n\n\traw_local_save_flags(flags)\n\traw_local_irq_save(flags)\n\traw_local_irq_restore(flags)\n\traw_local_irq_disable()\n\traw_local_irq_enable()\n\traw_irqs_disabled_flags(flags)\n\traw_irqs_disabled()\n\traw_safe_halt()\n\nwith type checking on the flags \u0027arguments\u0027, and then wraps those to provide:\n\n\tlocal_save_flags(flags)\n\tlocal_irq_save(flags)\n\tlocal_irq_restore(flags)\n\tlocal_irq_disable()\n\tlocal_irq_enable()\n\tirqs_disabled_flags(flags)\n\tirqs_disabled()\n\tsafe_halt()\n\nwith tracing included if enabled.\n\nThe arch functions can now all be inline functions rather than some of them\nhaving to be macros.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e [X86, FRV, MN10300]\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e [Tile]\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e [Microblaze]\nTested-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e [ARM]\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e [AVR]\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e [IA-64]\nAcked-by: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e [M32R]\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e [M68K/M68KNOMMU]\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e [MIPS]\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e [PA-RISC]\nAcked-by: Paul Mackerras \u003cpaulus@samba.org\u003e [PowerPC]\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e [S390]\nAcked-by: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e [Score]\nAcked-by: Matt Fleming \u003cmatt@console-pimps.org\u003e [SH]\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e [Sparc]\nAcked-by: Chris Zankel \u003cchris@zankel.net\u003e [Xtensa]\nReviewed-by: Richard Henderson \u003crth@twiddle.net\u003e [Alpha]\nReviewed-by: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e [H8300]\nCc: starvik@axis.com [CRIS]\nCc: jesper.nilsson@axis.com [CRIS]\nCc: linux-cris-kernel@axis.com\n" }, { "commit": "ed1cde68365c1251b920900c51e73675ff38dc66", "tree": "7f43fcfef76bc3d715db22ab575efadeefaf8739", "parents": [ "44c7afffa429a7cdcd1755019ab76566ff41e66d" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:25 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:38 2010 -0700" }, "message": "frv: double syscall restarts, syscall restart in sigreturn()\n\nWe need to make sure that only the first do_signal() to be handled on\nthe way out syscall will bother with syscall restarts; additionally, the\ncheck on the \"signal has user handler\" path had been wrong - compare\nwith restart prevention in sigreturn()...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44c7afffa429a7cdcd1755019ab76566ff41e66d", "tree": "6d7f1b59dfe72db861f6164323ba96a7129d05da", "parents": [ "ad0acab4557a91a60251b3ffe3478fad572d6f61" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:19 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:38 2010 -0700" }, "message": "frv: handling of restart into restart_syscall is fscked\n\ndo_signal() should place the syscall number in gr7, not gr8 when\nhandling ERESTART_WOULDBLOCK.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ad0acab4557a91a60251b3ffe3478fad572d6f61", "tree": "15800a89d6a04a0f0d72df2056f779a8755a5f97", "parents": [ "5f4ad04a1e805d14de080ff9d5384b4d20518a9a" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:14 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:37 2010 -0700" }, "message": "frv: avoid infinite loop of SIGSEGV delivery\n\nUse force_sigsegv() rather than force_sig(SIGSEGV, ...) as the former\nresets the SEGV handler pointer which will kill the process, rather than\nleaving it open to an infinite loop if the SEGV handler itself caused a\nSEGV signal.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5f4ad04a1e805d14de080ff9d5384b4d20518a9a", "tree": "63252b79b48b7dfd29d9a8081a34c858dab1de74", "parents": [ "20cd514d0f3d288d968217028ca67b70e707d896" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:09 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:37 2010 -0700" }, "message": "frv: fix address verification holes in setup_frame/setup_rt_frame\n\na) sa_handler might be maliciously set to point to kernel memory;\n blindly dereferencing it in FDPIC case is a Bad Idea(tm).\n\nb) I\u0027m not sure you need that set_fs(USER_DS) there at all, but if you\n do, you\u0027d better do it *before* checking the frame you\u0027ve decided to\n use with access_ok(), lest sigaltstack() becomes a convenient\n roothole.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20cd514d0f3d288d968217028ca67b70e707d896", "tree": "e6f01aab0ab568ca28fc11a9fbb575d91bafd3bd", "parents": [ "31c4a3d3a0f84a5847665f8aa0552d188389f791" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:04 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:37 2010 -0700" }, "message": "frv: restart_block.fn needs to be reset on sigreturn\n\nReset restart_block.fn on executing a sigreturn such that any currently\npending system call restarts will be forced to return -EINTR.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04", "tree": "b4d1e0b8dc63ce2832e16a9408190e44ee0ee79c", "parents": [ "c7abe8630ae63e90c2267c2c385a682e729e08be" ], "author": { "name": "Arnaud Lacombe", "email": "lacombar@gmail.com", "time": "Sat Sep 04 17:10:20 2010 -0400" }, "committer": { "name": "Arnaud Lacombe", "email": "lacombar@gmail.com", "time": "Sun Sep 19 22:54:11 2010 -0400" }, "message": "kbuild: migrate all arch to the kconfig mainmenu upgrade\n\nSigned-off-by: Arnaud Lacombe \u003clacombar@gmail.com\u003e\nReviewed-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nReviewed-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "d7627467b7a8dd6944885290a03a07ceb28c10eb", "tree": "a18c83468418e878cfb2d44e4310d81b8db84ad7", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Aug 17 23:52:56 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:07:43 2010 -0700" }, "message": "Make do_execve() take a const filename pointer\n\nMake do_execve() take a const filename pointer so that kernel_execve() compiles\ncorrectly on ARM:\n\narch/arm/kernel/sys_arm.c:88: warning: passing argument 1 of \u0027do_execve\u0027 discards qualifiers from pointer target type\n\nThis also requires the argv and envp arguments to be consted twice, once for\nthe pointer array and once for the strings the array points to. This is\nbecause do_execve() passes a pointer to the filename (now const) to\ncopy_strings_kernel(). A simpler alternative would be to cast the filename\npointer in do_execve() when it\u0027s passed to copy_strings_kernel().\n\ndo_execve() may not change any of the strings it is passed as part of the argv\nor envp lists as they are some of them in .rodata, so marking these strings as\nconst should be fine.\n\nFurther kernel_execve() and sys_execve() need to be changed to match.\n\nThis has been test built on x86_64, frv, arm and mips.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nTested-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7", "tree": "20607f7e67bf9bceab68e5b91030231de993ff51", "parents": [ "7cfddeef357aac78179ea804b11cffb5fbba8288" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:05:58 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:53 2010 +0200" }, "message": "defconfig reduction\n\nUse the defconfig files generated by \"make savedefconfig\" for\nremaining defconfig files.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "bf56fba6703592149e1bcd19220c60eb42dff9b7", "tree": "45908384005037b96ef4561345ded09da1798f14", "parents": [ "60641aa1f379820e99ac7f45a38b43795670c741" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 10:20:19 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:51 2010 +0200" }, "message": "archs: replace unifdef-y with header-y\n\nunifdef-y and header-y have same semantic, so drop unifdef-y\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "c7887325230aec47d47a32562a6e26014a0fafca", "tree": "10535943dace59ddb01d3440aa582bc4640e8016", "parents": [ "b84ae4a1401a731ef5fee987c0cb08743838dda7" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Aug 11 11:26:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 16:53:13 2010 -0700" }, "message": "Mark arguments to certain syscalls as being const\n\nMark arguments to certain system calls as being const where they should be but\naren\u0027t. The list includes:\n\n (*) The filename arguments of various stat syscalls, execve(), various utimes\n syscalls and some mount syscalls.\n\n (*) The filename arguments of some syscall helpers relating to the above.\n\n (*) The buffer argument of various write syscalls.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b9c6c11f519718d618f5d7c9508daf78b207f6f", "tree": "6c99992e25b9305fbe3977dff30f5eeb445f25e0", "parents": [ "d80e0d96a328cc864a1cb359f545a6ed0c61812d" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: remove dma_is_consistent API\n\nArchitectures implement dma_is_consistent() in different ways (some\nmisinterpret the definition of API in DMA-API.txt). So it hasn\u0027t been so\nuseful for drivers. We have only one user of the API in tree. Unlikely\nout-of-tree drivers use the API.\n\nEven if we fix dma_is_consistent() in some architectures, it doesn\u0027t look\nuseful at all. It was invented long ago for some old systems that can\u0027t\nallocate coherent memory at all. It\u0027s better to export only APIs that are\ndefinitely necessary for drivers.\n\nLet\u0027s remove this API.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4565f0170dfc849b3629c27d769db800467baa62", "tree": "a2c70fb6f2f4826749b704ed83557623ca95bca5", "parents": [ "a6eb9fe105d5de0053b261148cee56c94b4720ca" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: unify dma_get_cache_alignment implementations\n\ndma_get_cache_alignment returns the minimum DMA alignment. Architectures\ndefines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN). So we\ncan unify dma_get_cache_alignment implementations.\n\nNote that some architectures implement dma_get_cache_alignment wrongly.\ndma_get_cache_alignment() should return the minimum DMA alignment. So\nfully-coherent architectures should return 1. This patch also fixes this\nissue.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a6eb9fe105d5de0053b261148cee56c94b4720ca", "tree": "36e3f324a6a768397ef398674176c0f5f5365bff", "parents": [ "cd1542c8197fc3c2eb3a8301505d5d9738fab1e4" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN\n\nNow each architecture has the own dma_get_cache_alignment implementation.\n\ndma_get_cache_alignment returns the minimum DMA alignment. Architectures\ndefine it as ARCH_KMALLOC_MINALIGN (it\u0027s used to make sure that malloc\u0027ed\nbuffer is DMA-safe; the buffer doesn\u0027t share a cache with the others). So\nwe can unify dma_get_cache_alignment implementations.\n\nThis patch:\n\ndma_get_cache_alignment() needs to know if an architecture defines\nARCH_KMALLOC_MINALIGN or not (needs to know if architecture has DMA\nalignment restriction). However, slab.h define ARCH_KMALLOC_MINALIGN if\narchitectures doesn\u0027t define it.\n\nLet\u0027s rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN.\nARCH_KMALLOC_MINALIGN is used only in the internals of slab/slob/slub\n(except for crypto).\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f9e825d3e0e2b407ae8f082de5c00afcf7378fb", "tree": "f8b3ee40674ce4acd5508a0a0bf52a30904caf6c", "parents": [ "7ae0dea900b027cd90e8a3e14deca9a19e17638b", "de75d60d5ea235e6e09f4962ab22541ce0fe176a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block: (149 commits)\n block: make sure that REQ_* types are seen even with CONFIG_BLOCK\u003dn\n xen-blkfront: fix missing out label\n blkdev: fix blkdev_issue_zeroout return value\n block: update request stacking methods to support discards\n block: fix missing export of blk_types.h\n writeback: fix bad _bh spinlock nesting\n drbd: revert \"delay probes\", feature is being re-implemented differently\n drbd: Initialize all members of sync_conf to their defaults [Bugz 315]\n drbd: Disable delay probes for the upcomming release\n writeback: cleanup bdi_register\n writeback: add new tracepoints\n writeback: remove unnecessary init_timer call\n writeback: optimize periodic bdi thread wakeups\n writeback: prevent unnecessary bdi threads wakeups\n writeback: move bdi threads exiting logic to the forker thread\n writeback: restructure bdi forker loop a little\n writeback: move last_active to bdi\n writeback: do not remove bdi from bdi_list\n writeback: simplify bdi code a little\n writeback: do not lose wake-ups in bdi threads\n ...\n\nFixed up pretty trivial conflicts in drivers/block/virtio_blk.c and\ndrivers/scsi/scsi_error.c as per Jens.\n" }, { "commit": "26df6d13406d1a53b0bda08bd712f1924affd7cd", "tree": "db17328acbd7cac9dc20bc854509527c1c89ca01", "parents": [ "a3c8ed693da9782f924223f65da9261da796e49b" ], "author": { "name": "hyc@symas.com", "email": "hyc@symas.com", "time": "Tue Jun 22 10:14:49 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:39 2010 -0700" }, "message": "tty: Add EXTPROC support for LINEMODE\n\nThis patch is against the 2.6.34 source.\n\nParaphrased from the 1989 BSD patch by David Borman @ cray.com:\n\n These are the changes needed for the kernel to support\n LINEMODE in the server.\n\n There is a new bit in the termios local flag word, EXTPROC.\n When this bit is set, several aspects of the terminal driver\n are disabled. Input line editing, character echo, and mapping\n of signals are all disabled. This allows the telnetd to turn\n off these functions when in linemode, but still keep track of\n what state the user wants the terminal to be in.\n\n New ioctl:\n TIOCSIG Generate a signal to processes in the\n current process group of the pty.\n\n There is a new mode for packet driver, the TIOCPKT_IOCTL bit.\n When packet mode is turned on in the pty, and the EXTPROC bit\n is set, then whenever the state of the pty is changed, the\n next read on the master side of the pty will have the TIOCPKT_IOCTL\n bit set. This allows the process on the server side of the pty\n to know when the state of the terminal has changed; it can then\n issue the appropriate ioctl to retrieve the new state.\n\nSince the original BSD patches accompanied the source code for telnet\nI\u0027ve left that reference here, but obviously the feature is useful for\nany remote terminal protocol, including ssh.\n\nThe corresponding feature has existed in the BSD tty driver since 1989.\nFor historical reference, a good copy of the relevant files can be found\nhere:\n\nhttp://anonsvn.mit.edu/viewvc/krb5/trunk/src/appl/telnet/?pathrev\u003d17741\n\nSigned-off-by: Howard Chu \u003chyc@symas.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "597781f3e51f48ef8e67be772196d9e9673752c4", "tree": "6e1974bc899889da40f2fde47b04a5ece0bd3399", "parents": [ "3edd4fc9537d95e460d502987c63a90d6b9a7a82" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Mon Aug 09 17:18:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 20:44:54 2010 -0700" }, "message": "kmap_atomic: make kunmap_atomic() harder to misuse\n\nkunmap_atomic() is currently at level -4 on Rusty\u0027s \"Hard To Misuse\"\nlist[1] (\"Follow common convention and you\u0027ll get it wrong\"), except in\nsome architectures when CONFIG_DEBUG_HIGHMEM is set[2][3].\n\nkunmap() takes a pointer to a struct page; kunmap_atomic(), however, takes\ntakes a pointer to within the page itself. This seems to once in a while\ntrip people up (the convention they are following is the one from\nkunmap()).\n\nMake it much harder to misuse, by moving it to level 9 on Rusty\u0027s list[4]\n(\"The compiler/linker won\u0027t let you get it wrong\"). This is done by\nrefusing to build if the type of its first argument is a pointer to a\nstruct page.\n\nThe real kunmap_atomic() is renamed to kunmap_atomic_notypecheck()\n(which is what you would call in case for some strange reason calling it\nwith a pointer to a struct page is not incorrect in your code).\n\nThe previous version of this patch was compile tested on x86-64.\n\n[1] http://ozlabs.org/~rusty/index.cgi/tech/2008-04-01.html\n[2] In these cases, it is at level 5, \"Do it right or it will always\n break at runtime.\"\n[3] At least mips and powerpc look very similar, and sparc also seems to\n share a common ancestor with both; there seems to be quite some\n degree of copy-and-paste coding here. The include/asm/highmem.h file\n for these three archs mention x86 CPUs at its top.\n[4] http://ozlabs.org/~rusty/index.cgi/tech/2008-03-30.html\n[5] As an aside, could someone tell me why mn10300 uses unsigned long as\n the first parameter of kunmap_atomic() instead of void *?\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e (arch/arm)\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e (arch/mips)\nCc: David Howells \u003cdhowells@redhat.com\u003e (arch/frv, arch/mn10300)\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e (arch/mn10300)\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e (arch/parisc)\nCc: Helge Deller \u003cdeller@gmx.de\u003e (arch/parisc)\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e (arch/parisc)\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e (arch/powerpc)\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e (arch/powerpc)\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e (arch/sparc)\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e (arch/x86)\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e (arch/x86)\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e (arch/x86)\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e (include/asm-generic)\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e (\"Hard To Misuse\" list)\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7e005f79791dcd58436c88ded4a7f5aed1b82147", "tree": "3dfed83c36d9627ceffdedd783d1d02dadb7d436", "parents": [ "bfe172310e58225f0d07f9354b683abacbd6a0d8" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Mon May 31 15:59:04 2010 +0900" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:15:50 2010 +0200" }, "message": "remove needless ISA_DMA_THRESHOLD\n\nArchitectures don\u0027t need to define ISA_DMA_THRESHOLD anymore.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: James Bottomley \u003cJames.Bottomley@suse.de\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "b62ad9ab181a67207a4c8c373461b587c4861a68", "tree": "ace1572964d81f5f9bbc10b7960c1f742832d744", "parents": [ "af390084359a5de20046c901529b2b6a50b941cb", "b29230769e3482bbd62a07d6d9485371ee66a18f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "message": "Merge branch \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n um: Fix read_persistent_clock fallout\n kgdb: Do not access xtime directly\n powerpc: Clean up obsolete code relating to decrementer and timebase\n powerpc: Rework VDSO gettimeofday to prevent time going backwards\n clocksource: Add __clocksource_updatefreq_hz/khz methods\n x86: Convert common clocksources to use clocksource_register_hz/khz\n timekeeping: Make xtime and wall_to_monotonic static\n hrtimer: Cleanup direct access to wall_to_monotonic\n um: Convert to use read_persistent_clock\n timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset\n powerpc: Cleanup xtime usage\n powerpc: Simplify update_vsyscall\n time: Kill off CONFIG_GENERIC_TIME\n time: Implement timespec_add\n x86: Fix vtime/file timestamp inconsistencies\n\nTrivial conflicts in Documentation/feature-removal-schedule.txt\n\nMuch less trivial conflicts in arch/powerpc/kernel/time.c resolved as\nper Thomas\u0027 earlier merge commit 47916be4e28c (\"Merge branch\n\u0027powerpc.cherry-picks\u0027 into timers/clocksource\")\n" }, { "commit": "4aed2fd8e3181fea7c09ba79cf64e7e3f4413bf9", "tree": "1f69733e5daab4915a76a41de0e4d1dc61e12cfb", "parents": [ "3a3527b6461b1298cc53ce72f336346739297ac8", "fc9ea5a1e53ee54f681e226d735008e2a6f8f470" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)\n tracing/kprobes: unregister_trace_probe needs to be called under mutex\n perf: expose event__process function\n perf events: Fix mmap offset determination\n perf, powerpc: fsl_emb: Restore setting perf_sample_data.period\n perf, powerpc: Convert the FSL driver to use local64_t\n perf tools: Don\u0027t keep unreferenced maps when unmaps are detected\n perf session: Invalidate last_match when removing threads from rb_tree\n perf session: Free the ref_reloc_sym memory at the right place\n x86,mmiotrace: Add support for tracing STOS instruction\n perf, sched migration: Librarize task states and event headers helpers\n perf, sched migration: Librarize the GUI class\n perf, sched migration: Make the GUI class client agnostic\n perf, sched migration: Make it vertically scrollable\n perf, sched migration: Parameterize cpu height and spacing\n perf, sched migration: Fix key bindings\n perf, sched migration: Ignore unhandled task states\n perf, sched migration: Handle ignored migrate out events\n perf: New migration tool overview\n tracing: Drop cpparg() macro\n perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call\n ...\n\nFix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c\n" } ], "next": "772320e84588dcbe1600ffb83e5f328f2209ac2a" }