)]}' { "log": [ { "commit": "f429ee3b808118591d1f3cdf3c0d0793911a5677", "tree": "96d848f5f677d96758ecd2aee5eb6931b75bf218", "parents": [ "22b4eb5e3174efb49791c62823d0cccc35394c36", "c158a35c8a681cf68d36f22f058f9f5466386c71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:06:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:41:31 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)\n audit: no leading space in audit_log_d_path prefix\n audit: treat s_id as an untrusted string\n audit: fix signedness bug in audit_log_execve_info()\n audit: comparison on interprocess fields\n audit: implement all object interfield comparisons\n audit: allow interfield comparison between gid and ogid\n audit: complex interfield comparison helper\n audit: allow interfield comparison in audit rules\n Kernel: Audit Support For The ARM Platform\n audit: do not call audit_getname on error\n audit: only allow tasks to set their loginuid if it is -1\n audit: remove task argument to audit_set_loginuid\n audit: allow audit matching on inode gid\n audit: allow matching on obj_uid\n audit: remove audit_finish_fork as it can\u0027t be called\n audit: reject entry,always rules\n audit: inline audit_free to simplify the look of generic code\n audit: drop audit_set_macxattr as it doesn\u0027t do anything\n audit: inline checks for not needing to collect aux records\n audit: drop some potentially inadvisable likely notations\n ...\n\nUse evil merge to fix up grammar mistakes in Kconfig file.\n\nBad speling and horrible grammar (and copious swearing) is to be\nexpected, but let\u0027s keep it to commit messages and comments, rather than\nexpose it to users in config help texts or printouts.\n" }, { "commit": "b05d8447e7821695bc2fa3359431f7a664232743", "tree": "da90e558279c6407aa2e08d36bea5d9a21cd959c", "parents": [ "f031cd25568a390dc2c9c3a4015054183753449a" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:56 2012 -0500" }, "message": "audit: inline audit_syscall_entry to reduce burden on archs\n\nEvery arch calls:\n\nif (unlikely(current-\u003eaudit_context))\n\taudit_syscall_entry()\n\nwhich requires knowledge about audit (the existance of audit_context) in\nthe arch code. Just do it all in static inline in audit.h so that arch\u0027s\ncan remain blissfully ignorant.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "d7e7528bcd456f5c36ad4a202ccfb43c5aa98bc4", "tree": "ef49503b1dc52c52102e728dbd979c9309d5756b", "parents": [ "85e7bac33b8d5edafc4e219c7dfdb3d48e0b4e31" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:56 2012 -0500" }, "message": "Audit: push audit success and retcode into arch ptrace.h\n\nThe audit system previously expected arches calling to audit_syscall_exit to\nsupply as arguments if the syscall was a success and what the return code was.\nAudit also provides a helper AUDITSC_RESULT which was supposed to simplify things\nby converting from negative retcodes to an audit internal magic value stating\nsuccess or failure. This helper was wrong and could indicate that a valid\npointer returned to userspace was a failed syscall. The fix is to fix the\nlayering foolishness. We now pass audit_syscall_exit a struct pt_reg and it\nin turns calls back into arch code to collect the return value and to\ndetermine if the syscall was a success or failure. We also define a generic\nis_syscall_success() macro which determines success/failure based on if the\nvalue is \u003c -MAX_ERRNO. This works for arches like x86 which do not use a\nseparate mechanism to indicate syscall failure.\n\nWe make both the is_syscall_success() and regs_return_value() static inlines\ninstead of macros. The reason is because the audit function must take a void*\nfor the regs. (uml calls theirs struct uml_pt_regs instead of just struct\npt_regs so audit_syscall_exit can\u0027t take a struct pt_regs). Since the audit\nfunction takes a void* we need to use static inlines to cast it back to the\narch correct structure to dereference it.\n\nThe other major change is that on some arches, like ia64, MIPS and ppc, we\nchange regs_return_value() to give us the negative value on syscall failure.\nTHE only other user of this macro, kretprobe_example.c, won\u0027t notice and it\nmakes the value signed consistently for the audit functions across all archs.\n\nIn arch/sh/kernel/ptrace_64.c I see that we were using regs[9] in the old\naudit code as the return value. But the ptrace_64.h code defined the macro\nregs_return_value() as regs[3]. I have no idea which one is correct, but this\npatch now uses the regs_return_value() function, so it now uses regs[3].\n\nFor powerpc we previously used regs-\u003eresult but now use the\nregs_return_value() function which uses regs-\u003egprs[3]. regs-\u003egprs[3] is\nalways positive so the regs_return_value(), much like ia64 makes it negative\nbefore calling the audit code when appropriate.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e [for x86 portion]\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e [for ia64]\nAcked-by: Richard Weinberger \u003crichard@nod.at\u003e [for uml]\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e [for sparc]\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e [for mips]\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e [for ppc]\n" }, { "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": "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": "f350b1778f1b7713ef54fbc7e079e09e2fe098b9", "tree": "8f14a0c2d4ebbc4aab33b14facff2e321f15938d", "parents": [ "9b467e6ebebbe75288aeb7e816ffbb5d35d6eaa3" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Tue Jan 10 15:11:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "sparc: make SA_NOMASK a synonym of SA_NODEFER\n\nUnlike other architectures, sparc currently has no SA_NODEFER definition\nbut only the older SA_NOMASK. Since SA_NOMASK is the historical name for\nSA_NODEFER, add SA_NODEFER and copy what other architectures do by making\nSA_NOMASK a synonym for SA_NODEFER.\n\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"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": "37cfc3f67db9f2d907f6bfcfae590cdbbef623e8", "tree": "b573983938838dd76b40a7b53b3744472041720f", "parents": [ "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:\n sparc32: remove unused file: include/asm/pgtsun4.h\n sparc32: fix PAGE_SIZE definition\n sparc32: enable different preemptions models\n sparc32: support atomic64_t\n apbuart: fix section mismatch warning\n sparc32: drop useless preprocessor conditional in atomic_32.h\n sparc32: drop unused atomic24 support\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": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d", "tree": "9eef6998f5bbd1a2c999011d9e0151f00c6e7297", "parents": [ "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)\n powerpc: fix compile error with 85xx/p1010rdb.c\n powerpc: fix compile error with 85xx/p1023_rds.c\n powerpc/fsl: add MSI support for the Freescale hypervisor\n arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree\n powerpc/fsl: Add support for Integrated Flash Controller\n powerpc/fsl: update compatiable on fsl 16550 uart nodes\n powerpc/85xx: fix PCI and localbus properties in p1022ds.dts\n powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig\n powerpc/fsl: Update defconfigs to enable some standard FSL HW features\n powerpc: Add TBI PHY node to first MDIO bus\n sbc834x: put full compat string in board match check\n powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address\n powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit\n offb: Fix setting of the pseudo-palette for \u003e8bpp\n offb: Add palette hack for qemu \"standard vga\" framebuffer\n offb: Fix bug in calculating requested vram size\n powerpc/boot: Change the WARN to INFO for boot wrapper overlap message\n powerpc/44x: Fix build error on currituck platform\n powerpc/boot: Change the load address for the wrapper to fit the kernel\n powerpc/44x: Enable CRASH_DUMP for 440x\n ...\n\nFix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to\nthe additional sparse-checking code for cputime_t.\n" }, { "commit": "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "tree": "c017a1b4a70b8447c71b01d8b320e071546b5c9d", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913", "9f42f126154786e6e76df513004800c8c633f020" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)\n net: pack skb_shared_info more efficiently\n net_sched: red: split red_parms into parms and vars\n net_sched: sfq: extend limits\n cnic: Improve error recovery on bnx2x devices\n cnic: Re-init dev-\u003estats_addr after chip reset\n net_sched: Bug in netem reordering\n bna: fix sparse warnings/errors\n bna: make ethtool_ops and strings const\n xgmac: cleanups\n net: make ethtool_ops const\n vmxnet3\" make ethtool ops const\n xen-netback: make ops structs const\n virtio_net: Pass gfp flags when allocating rx buffers.\n ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call\n netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call\n igb: reset PHY after recovering from PHY power down\n igb: add basic runtime PM support\n igb: Add support for byte queue limits.\n e1000: cleanup CE4100 MDIO registers access\n e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove\n ...\n" }, { "commit": "2b591616ada6cf499a4e83bf453761e40dc53059", "tree": "a2bb55b55351710f7ea1a138410c8c2ad27b38b3", "parents": [ "1a300107b5a49e3b7da080ae4827a9ee17c49a25" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri Oct 28 16:27:58 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:11:11 2012 -0800" }, "message": "sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources\n\nConvert from pci_scan_bus_parented() to pci_scan_root_bus() and remove root\nbus resource fixups. This fixes the problem of \"early\" and \"header\" quirks\nseeing incorrect root bus resources.\n\npci_scan_root_bus() also includes the pci_bus_add_devices() so we don\u0027t\nneed to do that separately.\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "1a300107b5a49e3b7da080ae4827a9ee17c49a25", "tree": "86952156aec5378df93cc59fb54481189af39f1a", "parents": [ "6f17dd1ba96bb857fc1e8ab0357a6a0a09935baf" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri Oct 28 16:27:53 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:11:11 2012 -0800" }, "message": "sparc/PCI: convert to pci_create_root_bus()\n\nConvert from pci_create_bus() to pci_create_root_bus(). This way the root\nbus resources are correct immediately. This patch doesn\u0027t fix a problem\nbecause sparc fixed the resources before scanning the bus, but it makes\nsparc more consistent with other architectures.\n\nv2: fix build error (from sfr)\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "ba232a1fe4d4bca18efc8966e08dbf85abf11519", "tree": "dc792e000bf22850fa4e2a2ae04f643c0858120f", "parents": [ "79c8be8384d8b41ff67b5fda03c7ace3c3af1550" ], "author": { "name": "Myron Stowe", "email": "mstowe@redhat.com", "time": "Fri Oct 28 15:48:10 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:10:39 2012 -0800" }, "message": "PCI: SPARC: convert pcibios_set_master() to a non-inlined function\n\nThis patch converts SPARC\u0027s architecture-specific\n\u0027pcibios_set_master()\u0027 routine to a non-inlined function. This will\nallow follow on patches to create a generic \u0027pcibios_set_master()\u0027\nfunction using the \u0027__weak\u0027 attribute which can be used by all\narchitectures as a default which, if necessary, can then be over-\nridden by architecture-specific code.\n\nConverting \u0027pci_bios_set_master()\u0027 to a non-inlined function will\nallow SPARC\u0027s \u0027pcibios_set_master()\u0027 implementation to remain\narchitecture-specific after the generic version is introduced and\nthus, not change current behavior.\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": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\n" }, { "commit": "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "tree": "1ef38a6a3b39f7e539fff848975a5672acc21f44", "parents": [ "15f043a65f655eb8a3aeb831a85da66de520c80f", "45aa0663cc408617b79a2b53f0a5f50e94688a48" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "message": "Merge branch \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)\n memblock: Reimplement memblock allocation using reverse free area iterator\n memblock: Kill early_node_map[]\n score: Use HAVE_MEMBLOCK_NODE_MAP\n s390: Use HAVE_MEMBLOCK_NODE_MAP\n mips: Use HAVE_MEMBLOCK_NODE_MAP\n ia64: Use HAVE_MEMBLOCK_NODE_MAP\n SuperH: Use HAVE_MEMBLOCK_NODE_MAP\n sparc: Use HAVE_MEMBLOCK_NODE_MAP\n powerpc: Use HAVE_MEMBLOCK_NODE_MAP\n memblock: Implement memblock_add_node()\n memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users\n memblock: Track total size of regions automatically\n powerpc: Cleanup memblock usage\n memblock: Reimplement memblock_enforce_memory_limit() using __memblock_remove()\n memblock: Make memblock functions handle overflowing range @size\n memblock: Reimplement __memblock_remove() using memblock_isolate_range()\n memblock: Separate out memblock_isolate_range() from memblock_set_node()\n memblock: Kill memblock_init()\n memblock: Kill sentinel entries at the end of static region arrays\n memblock: Add __memblock_dump_all()\n ...\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": "6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546", "tree": "765291075b2b334df16cf120fbc37259a2bcd342", "parents": [ "a4b4f4371b94552973109f6b9ebe6af7a9efa0bd" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Fri Dec 30 13:32:16 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:29:18 2011 -0500" }, "message": "sparc32: remove unused file: include/asm/pgtsun4.h\n\nsun4 is no longer supported and this file is unused.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61", "tree": "d6e9edb2087fa4a97b2cc3d585a0189672a14cf4", "parents": [ "8ade06c616b34b4237c0ed77d1ff0ce04ad7d056", "89307babf966165171547f105e2253dec261cfa5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "a4b4f4371b94552973109f6b9ebe6af7a9efa0bd", "tree": "1a5404b34c2e547ab6a9f8aa7a940d5b9c54e163", "parents": [ "b2a1fa30b54ed616e0ae6f521bcd3fad750f5184" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Thu Dec 29 15:04:38 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 14:58:31 2011 -0800" }, "message": "sparc32: fix PAGE_SIZE definition\n\nUse _AC() in definition of PAGE_SIZE so the same definition\ncan be used in C and assembler.\nAlso use PAGE_SIZE in definition of THREAD_SIZE.\n\nThis commit kill the following comment:\n\n \"I have my suspicions... -DaveM\"\n\nI did not find any clue what this referred to anyway.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b2a1fa30b54ed616e0ae6f521bcd3fad750f5184", "tree": "d1832a72a8014e6e2fc54f343895da4eca4cb5de", "parents": [ "aea1181b0bd0a09c54546399768f359d1e198e45" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Thu Dec 29 14:54:49 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 14:58:31 2011 -0800" }, "message": "sparc32: enable different preemptions models\n\nWhile chasing following warning from kconfig I noticed that the\nkconfig preemption model symbols were all dependent on sparc64.\n\nwarning: (PREEMPT \u0026\u0026 DEBUG_ATOMIC_SLEEP) selects PREEMPT_COUNT which has unmet direct dependencies (SPARC64)\n\n\u003eFrom arch/sparc/Kconfig:\n\n if SPARC64\n source \"kernel/Kconfig.preempt\"\n endif\n\nBut looking a bit closer I see nothing obvious why\nsparc32 should not support the various preemption models.\nDrop the \"if SPARC64\" conditional to enable selection of\npreemption model on sparc32 too.\n\nBuild-tested - but not run-time tested all three models.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aea1181b0bd0a09c54546399768f359d1e198e45", "tree": "1cd2b545f2ea4b6d52b5e593a9da5c115598d1d6", "parents": [ "ab17da5cb9d4aaf9f04c706761d3a8024897bedd" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Tue Dec 27 21:46:53 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 16:33:13 2011 -0500" }, "message": "sparc32: support atomic64_t\n\nThere is no-one that really require atomic64_t support on sparc32.\nBut several drivers fails to build without proper atomic64 support.\nAnd for an allyesconfig build for sparc32 this is annoying.\n\nInclude the generic atomic64_t support for sparc32.\nThis has a text footprint cost:\n\n$size vmlinux (before atomic64_t support)\n text data bss dec hex filename\n3578860 134260 108781 3821901 3a514d vmlinux\n\n$size vmlinux (after atomic64_t support)\n text data bss dec hex filename\n3579892 130684 108781 3819357 3a475d vmlinux\n\ntext increase (3579892 - 3578860) \u003d 1032 bytes\n\ndata decreases - but I fail to explain why!\nI have rebuild twice to check my numbers.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1a8b69afd63f26f8e7be39e3bc78c4894cdb9fd", "tree": "e5a0d19e61ce90e300aac33415cdaeceaf75a09e", "parents": [ "348738afe530cc3a7306bbd3d1ccd322f9638f32" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Dec 26 21:05:27 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 14:11:40 2011 -0500" }, "message": "sparc32: drop useless preprocessor conditional in atomic_32.h\n\narch/sparc/include/asm/atomic_32.h is not exported to userspace.\nSo there is no need to protect code using __KERNEL__.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "348738afe530cc3a7306bbd3d1ccd322f9638f32", "tree": "7ae88b2743aa8d1c0b5633b43877bd6aeecfe0c8", "parents": [ "371de6e4e0042adf4f9b54c414154f57414ddd37" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Dec 26 20:57:22 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 14:11:40 2011 -0500" }, "message": "sparc32: drop unused atomic24 support\n\natomic24 support was used to semaphores in the past - but is no longer used.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7ba68c4a072c9aa8f04b8cf7838b6cd2f48d918", "tree": "cd8f8029111fc52d06060691fb0325ba2e798e94", "parents": [ "8d274ab7d3d6f23e2bc0e433c8d53acbe60a9773", "90363ddf0a1a4dccfbb8d0c10b8f488bc7fa69f8" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:42:20 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:42:20 2011 +0100" }, "message": "Merge branch \u0027pm-sleep\u0027 into pm-for-linus\n\n* pm-sleep: (51 commits)\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 / 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 PM / Sleep: Recommend [un]lock_system_sleep() over using pm_mutex directly\n PM / Sleep: Replace mutex_[un]lock(\u0026pm_mutex) with [un]lock_system_sleep()\n PM / Sleep: Make [un]lock_system_sleep() generic\n PM / Sleep: Use the freezer_count() functions in [un]lock_system_sleep() APIs\n PM / Freezer: Remove the \"userspace only\" constraint from freezer[_do_not]_count()\n PM / Hibernate: Replace unintuitive \u0027if\u0027 condition in kernel/power/user.c with \u0027else\u0027\n Freezer / sunrpc / NFS: don\u0027t allow TASK_KILLABLE sleeps to block the freezer\n PM / Sleep: Unify diagnostic messages from device suspend/resume\n ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR\n PM / Hibernate: Remove deprecated hibernation test modes\n PM / Hibernate: Thaw processes in SNAPSHOT_CREATE_IMAGE ioctl test path\n ...\n\nConflicts:\n\tkernel/kmod.c\n" }, { "commit": "abb434cb0539fb355c1c921f8fd761efbbac3462", "tree": "24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6", "parents": [ "2494654d4890316e7340fb8b3458daad0474a1b9", "6350323ad8def2ac00d77cdee3b79c9b9fba75c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/bluetooth/l2cap_core.c\n\nJust two overlapping changes, one added an initialization of\na local variable, and another change added a new local variable.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7cc8583372a21d98a23b703ad96cab03180b5030", "tree": "15c342c336b72e431ce96f1b4d27930b9f58ebe2", "parents": [ "b3b1b70e62a603f473619dbebc3b3d23f535e6f8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 22 13:23:59 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 22 13:46:53 2011 -0800" }, "message": "sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().\n\nThis silently was working for many years and stopped working on\nNiagara-T3 machines.\n\nWe need to set the MSIQ to VALID before we can set it\u0027s state to IDLE.\n\nOn Niagara-T3, setting the state to IDLE first was causing HV_EINVAL\nerrors. The hypervisor documentation says, rather ambiguously, that\nthe MSIQ must be \"initialized\" before one can set the state.\n\nI previously understood this to mean merely that a successful setconf()\noperation has been performed on the MSIQ, which we have done at this\npoint. But it seems to also mean that it has been set VALID too.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a25a2fd126c621f44f3aeaef80d51f00fc11639", "tree": "41694ab1a9c82a7a02d9cd33c929fd039c98c815", "parents": [ "cb0c05c5fae12eeb7c85c205578df277bd706155" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 14:29:42 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 14:29:42 2011 -0800" }, "message": "cpu: convert \u0027cpu\u0027 and \u0027machinecheck\u0027 sysdev_class to a regular subsystem\n\nThis moves the \u0027cpu sysdev_class\u0027 over to a regular \u0027cpu\u0027 subsystem\nand converts the devices to regular devices. The sysdev drivers are\nimplemented as subsystem interfaces now.\n\nAfter all sysdev classes are ported to regular driver core entities, the\nsysdev implementation will be entirely removed from the kernel.\n\nUserspace relies on events and generic sysfs subsystem infrastructure\nfrom sysdev devices, which are made available with this conversion.\n\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@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: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nCc: Tigran Aivazian \u003ctigran@aivazian.fsnet.co.uk\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Zhang Rui \u003crui.zhang@intel.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: \"Srivatsa S. Bhat\" \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b00f4dc5ff022cb9cbaffd376d9454d7fa1e496f", "tree": "40f1b232e2f1e8ac365317a14fdcbcb331722b46", "parents": [ "1eac8111e0763853266a171ce11214da3a347a0a", "b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "message": "Merge branch \u0027master\u0027 into pm-sleep\n\n* master: (848 commits)\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n binary_sysctl(): fix memory leak\n mm/vmalloc.c: remove static declaration of va from __get_vm_area_node\n ipmi_watchdog: restore settings when BMC reset\n oom: fix integer overflow of points in oom_badness\n memcg: keep root group unchanged if creation fails\n nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()\n nilfs2: unbreak compat ioctl\n cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask\n evm: prevent racing during tfm allocation\n evm: key must be set once during initialization\n mmc: vub300: fix type of firmware_rom_wait_states module parameter\n Revert \"mmc: enable runtime PM by default\"\n mmc: sdhci: remove \"state\" argument from sdhci_suspend_host\n x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT\n IB/qib: Correct sense on freectxts increment and decrement\n RDMA/cma: Verify private data length\n cgroups: fix a css_set not found bug in cgroup_attach_proc\n oprofile: Fix uninitialized memory access when writing to writing to oprofilefs\n Revert \"xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel\"\n ...\n\nConflicts:\n\tkernel/cgroup_freezer.c\n" }, { "commit": "45aa0663cc408617b79a2b53f0a5f50e94688a48", "tree": "0a53931c317c3c72a3555bd2fbb70a881ee870f2", "parents": [ "511585a28e5b5fd1cac61e601e42efc4c5dd64b5", "7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:14:26 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:14:26 2011 +0100" }, "message": "Merge branch \u0027memblock-kill-early_node_map\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock\n" }, { "commit": "b1f44e13a525d2ffb7d5afe2273b7169d6f2222e", "tree": "ba282dbd218ad8cf2e51e5325fecd43a4554c9d7", "parents": [ "dbf2b92d54e73e4a2524b90d29bd498ecc4aa593" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 14 10:05:22 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 14 10:57:28 2011 -0800" }, "message": "sparc32: Be less strict in matching %lo part of relocation.\n\nThe \"(insn \u0026 0x01800000) !\u003d 0x01800000\" test matches \u0027restore\u0027\nbut that is a legitimate place to see the %lo() part of a 32-bit\nsymbol relocation, particularly in tail calls.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Sergei Trofimovich \u003cslyfox@gentoo.org\u003e\n" }, { "commit": "070712c6cd8a02e57506ebf52d7c6056d7535b42", "tree": "497ff94a4b0174c24e148a0607673d71f3fe9297", "parents": [ "8935e13457341841a6a02b8c8f65799f18cf4804" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Dec 12 13:54:35 2011 +0000" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Dec 12 13:54:35 2011 +0000" }, "message": "UAPI: Don\u0027t include linux/compat.h in sparc\u0027s asm/siginfo.h\n\nDon\u0027t include linux/compat.h in sparc\u0027s asm/siginfo.h as it leads to a circular\ndependency:\n\n\tasm/siginfo.h -\u003e linux/compat.h -\u003e asm/siginfo.h\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: David S. Miller \u003cdavem@davemloft.net\u003e\ncc: sparclinux@vger.kernel.org\n" }, { "commit": "1268fbc746ea1cd279886a740dcbad4ba5232225", "tree": "dc0ff36b4114992a3f67479e25132f5e99f36b9e", "parents": [ "b58bdccaa8d908e0f71dae396468a0d3f7bb3125" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Nov 17 18:48:14 2011 +0100" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:57 2011 -0800" }, "message": "nohz: Remove tick_nohz_idle_enter_norcu() / tick_nohz_idle_exit_norcu()\n\nThose two APIs were provided to optimize the calls of\ntick_nohz_idle_enter() and rcu_idle_enter() into a single\nirq disabled section. This way no interrupt happening in-between would\nneedlessly process any RCU job.\n\nNow we are talking about an optimization for which benefits\nhave yet to be measured. Let\u0027s start simple and completely decouple\nidle rcu and dyntick idle logics to simplify.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "29f043a2caea2860db36fbeda0c17f79bf0cffbe", "tree": "c776a156e1a3d3dcee8d6082e6b731f17c94914f", "parents": [ "99745b6a83414006f5c1e83efaebb423b41b67ef" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Thu Nov 10 15:56:46 2011 -0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:49 2011 -0800" }, "message": "sparc: Make SPARC use the new is_idle_task() API\n\nChange from direct comparison of -\u003epid with zero to is_idle_task().\n\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\n" }, { "commit": "2bbb6817c0ac1b5f2a68d720f364f98eeb1ac4fd", "tree": "05bb5ba54671a8eaeca4fe4406a75e820317e473", "parents": [ "280f06774afedf849f0b34248ed6aff57d0f6908" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat Oct 08 16:01:00 2011 +0200" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:36 2011 -0800" }, "message": "nohz: Allow rcu extended quiescent state handling seperately from tick stop\n\nIt is assumed that rcu won\u0027t be used once we switch to tickless\nmode and until we restart the tick. However this is not always\ntrue, as in x86-64 where we dereference the idle notifiers after\nthe tick is stopped.\n\nTo prepare for fixing this, add two new APIs:\ntick_nohz_idle_enter_norcu() and tick_nohz_idle_exit_norcu().\n\nIf no use of RCU is made in the idle loop between\ntick_nohz_enter_idle() and tick_nohz_exit_idle() calls, the arch\nmust instead call the new *_norcu() version such that the arch doesn\u0027t\nneed to call rcu_idle_enter() and rcu_idle_exit().\n\nOtherwise the arch must call tick_nohz_enter_idle() and\ntick_nohz_exit_idle() and also call explicitly:\n\n- rcu_idle_enter() after its last use of RCU before the CPU is put\nto sleep.\n- rcu_idle_exit() before the first use of RCU after the CPU is woken\nup.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "280f06774afedf849f0b34248ed6aff57d0f6908", "tree": "62ef683226d0569c0e6c3ba34ab2e6d85b2e047f", "parents": [ "867f236bd12f5091df6dc7cc75f94d7fd982d78a" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Oct 07 18:22:06 2011 +0200" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:35 2011 -0800" }, "message": "nohz: Separate out irq exit and idle loop dyntick logic\n\nThe tick_nohz_stop_sched_tick() function, which tries to delay\nthe next timer tick as long as possible, can be called from two\nplaces:\n\n- From the idle loop to start the dytick idle mode\n- From interrupt exit if we have interrupted the dyntick\nidle mode, so that we reprogram the next tick event in\ncase the irq changed some internal state that requires this\naction.\n\nThere are only few minor differences between both that\nare handled by that function, driven by the ts-\u003einidle\ncpu variable and the inidle parameter. The whole guarantees\nthat we only update the dyntick mode on irq exit if we actually\ninterrupted the dyntick idle mode, and that we enter in RCU extended\nquiescent state from idle loop entry only.\n\nSplit this function into:\n\n- tick_nohz_idle_enter(), which sets ts-\u003einidle to 1, enters\ndynticks idle mode unconditionally if it can, and enters into RCU\nextended quiescent state.\n\n- tick_nohz_irq_exit() which only updates the dynticks idle mode\nwhen ts-\u003einidle is set (ie: if tick_nohz_idle_enter() has been called).\n\nTo maintain symmetry, tick_nohz_restart_sched_tick() has been renamed\ninto tick_nohz_idle_exit().\n\nThis simplifies the code and micro-optimize the irq exit path (no need\nfor local_irq_save there). This also prepares for the split between\ndynticks and rcu extended quiescent state logics. We\u0027ll need this split to\nfurther fix illegal uses of RCU in extended quiescent states in the idle\nloop.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\n" }, { "commit": "0ee332c1451869963626bf9cac88f165a90990e1", "tree": "a40e6c9c6cfe39ecbca37a08019be3c9e56a4a9b", "parents": [ "a2bf79e7dcc97b4e9654f273453f9264f49e41ff" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:09 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:09 2011 -0800" }, "message": "memblock: Kill early_node_map[]\n\nNow all ARCH_POPULATES_NODE_MAP archs select HAVE_MEBLOCK_NODE_MAP -\nthere\u0027s no user of early_node_map[] left. Kill early_node_map[] and\nreplace ARCH_POPULATES_NODE_MAP with HAVE_MEMBLOCK_NODE_MAP. Also,\nrelocate for_each_mem_pfn_range() and helper from mm.h to memblock.h\nas page_alloc.c would no longer host an alternative implementation.\n\nThis change is ultimately one to one mapping and shouldn\u0027t cause any\nobservable difference; however, after the recent changes, there are\nsome functions which now would fit memblock.c better than page_alloc.c\nand dependency on HAVE_MEMBLOCK_NODE_MAP instead of HAVE_MEMBLOCK\ndoesn\u0027t make much sense on some of them. Further cleanups for\nfunctions inside HAVE_MEMBLOCK_NODE_MAP in mm.h would be nice.\n\n-v2: Fix compile bug introduced by mis-spelling\n CONFIG_HAVE_MEMBLOCK_NODE_MAP to CONFIG_MEMBLOCK_HAVE_NODE_MAP in\n mmzone.h. Reported by Stephen Rothwell.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\n" }, { "commit": "2a4814df545a0645aff6fc04e5106877cc576945", "tree": "87c3f223590e548f01043d7008ab72bc13ac71b8", "parents": [ "1d7cfe18ec2eb2d0480a9b29465af66b61291202" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "message": "sparc: Use HAVE_MEMBLOCK_NODE_MAP\n\nsparc doesn\u0027t access early_node_map[] directly and enabling\nHAVE_MEMBLOCK_NODE_MAP is trivial - replacing add_active_range() calls\nwith memblock_set_node() and selecting HAVE_MEMBLOCK_NODE_MAP is\nenough.\n\n-v2: Use select in Kconfig instead as suggested by Sam Ravnborg.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: sparclinux@vger.kernel.org\n" }, { "commit": "1aadc0560f46530f8a0f11055285b876a8a31770", "tree": "9d57dbe134894d4f8d20cfd246ac9457af65b271", "parents": [ "1440c4e2c918532f39131c3330fe2226e16be7b6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "message": "memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users\n\nThe only function of memblock_analyze() is now allowing resize of\nmemblock region arrays. Rename it to memblock_allow_resize() and\nupdate its users.\n\n* The following users remain the same other than renaming.\n\n arm/mm/init.c::arm_memblock_init()\n microblaze/kernel/prom.c::early_init_devtree()\n powerpc/kernel/prom.c::early_init_devtree()\n openrisc/kernel/prom.c::early_init_devtree()\n sh/mm/init.c::paging_init()\n sparc/mm/init_64.c::paging_init()\n unicore32/mm/init.c::uc32_memblock_init()\n\n* In the following users, analyze was used to update total size which\n is no longer necessary.\n\n powerpc/kernel/machine_kexec.c::reserve_crashkernel()\n powerpc/kernel/prom.c::early_init_devtree()\n powerpc/mm/init_32.c::MMU_init()\n powerpc/mm/tlb_nohash.c::__early_init_mmu() \n powerpc/platforms/ps3/mm.c::ps3_mm_add_memory()\n powerpc/platforms/embedded6xx/wii.c::wii_memory_fixups()\n sh/kernel/machine_kexec.c::reserve_crashkernel()\n\n* x86/kernel/e820.c::memblock_x86_fill() was directly setting\n memblock_can_resize before populating memblock and calling analyze\n afterwards. Call memblock_allow_resize() before start populating.\n\nmemblock_can_resize is now static inside memblock.c.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\n" }, { "commit": "fe091c208a40299fba40e62292a610fb91e44b4e", "tree": "72bf673f05a736cbf3555a4dcf428b95840fc9f7", "parents": [ "c5a1cb284b791fcc3c70962331a682452afaf6cd" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:07 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:07 2011 -0800" }, "message": "memblock: Kill memblock_init()\n\nmemblock_init() initializes arrays for regions and memblock itself;\nhowever, all these can be done with struct initializers and\nmemblock_init() can be removed. This patch kills memblock_init() and\ninitializes memblock with struct initializer.\n\nThe only difference is that the first dummy entries don\u0027t have .nid\nset to MAX_NUMNODES initially. This doesn\u0027t cause any behavior\ndifference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\n" }, { "commit": "1c16d242aa441c11ccaeaa63b49712555b8bfaeb", "tree": "ff8332060f3d800abbabbfe63a942e0ef6d93d33", "parents": [ "d4bbf7e7759afc172e2bfbc5c416324590049cdd" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:06 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:06 2011 -0800" }, "message": "memblock: Fix include breakages caused by 24aa07882b\n\n24aa07882b (memblock, x86: Replace memblock_x86_reserve/free_range()\nwith generic ones) removed arch/x86/include/asm/memblock.h and dropped\nits inclusion from include/linux/memblock.h which breaks other\narchitectures which depended on the generic memblock.h pulling in the\narch specific one.\n\nHowever, the proper fix isn\u0027t adding back the asm inclusion. memblock\ndoesn\u0027t have any arch dependent part and doesn\u0027t need arch specific\nheader file and asm/memblock.h files are either practically empty or\ncontain mostly unrelated arch specific stuff.\n\n* In microblaze, sh, powerpc, sparc and openrisc, asm/memblock.h is\n either empty or just contains unused MEMBLOCK_DBG() macro. Remove\n them.\n\n* In arm and unicore32, asm/memblock.h contains arch specific stuff.\n Include it directly from its users. It might be a good idea to\n rename the header file to avoid confusion.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\n" }, { "commit": "f0a4cf31017ac8179a2fe295c1bd8e821d7674f4", "tree": "1a640c00647cc7eb90d9849033071270f39f81d7", "parents": [ "e5fd47bfab2df0c2184cc0bf4245d8e1bb7724fb" ], "author": { "name": "Thomas Meyer", "email": "thomas@m3y3r.de", "time": "Thu Nov 17 12:43:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 04 10:46:56 2011 -0800" }, "message": "sparc: Use kmemdup rather than duplicating its implementation\n\nThe semantic patch that makes this change is available\nin scripts/coccinelle/api/memdup.cocci.\n\nSigned-off-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a21a2fd4036f9a572415a7543896a1163c211ee5", "tree": "e668585f82aee3abb56b011c78cdb7a5f46099da", "parents": [ "43db595e8b5d78ce5ad2feab719814a76e3ad2e5" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 24 21:10:12 2011 +0200" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Dec 04 15:59:49 2011 +0200" }, "message": "sparc: switch to GENERIC_PCI_IOMAP\n\nsparc copied pci_iomap from generic code, probably to avoid\npulling the rest of iomap.c in. Since that\u0027s in\na separate file now, we can reuse the common implementation.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n" }, { "commit": "42b2aa86c6670347a2a07e6d7af0e0ecc8fdbff9", "tree": "6f8fb2a1efb3e84bf281658befe06dc6a7fb026b", "parents": [ "a13b032776379fa6e2bfccf798969ca51e5fb052" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Nov 28 20:31:00 2011 -0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 02 14:57:31 2011 +0100" }, "message": "treewide: Fix typos in various parts of the kernel, and fix some comments.\n\nThe below patch fixes some typos in various parts of the kernel, as well as fixes some comments.\nPlease let me know if I missed anything, and I will try to get it changed and resent.\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d4bbf7e7759afc172e2bfbc5c416324590049cdd", "tree": "7eab5ee5481cd3dcf1162329fec827177640018a", "parents": [ "a150439c4a97db379f0ed6faa46fbbb6e7bf3cb2", "401d0069cb344f401bc9d264c31db55876ff78c0" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 28 09:46:22 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 28 09:46:22 2011 -0800" }, "message": "Merge branch \u0027master\u0027 into x86/memblock\n\nConflicts \u0026 resolutions:\n\n* arch/x86/xen/setup.c\n\n\tdc91c728fd \"xen: allow extra memory to be in multiple regions\"\n\t24aa07882b \"memblock, x86: Replace memblock_x86_reserve/free...\"\n\n\tconflicted on xen_add_extra_mem() updates. The resolution is\n\ttrivial as the latter just want to replace\n\tmemblock_x86_reserve_range() with memblock_reserve().\n\n* drivers/pci/intel-iommu.c\n\n\t166e9278a3f \"x86/ia64: intel-iommu: move to drivers/iommu/\"\n\t5dfe8660a3d \"bootmem: Replace work_with_active_regions() with...\"\n\n\tconflicted as the former moved the file under drivers/iommu/.\n\tResolved by applying the chnages from the latter on the moved\n\tfile.\n\n* mm/Kconfig\n\n\t6661672053a \"memblock: add NO_BOOTMEM config symbol\"\n\tc378ddd53f9 \"memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option\"\n\n\tconflicted trivially. Both added config options. Just\n\tletting both add their own options resolves the conflict.\n\n* mm/memblock.c\n\n\td1f0ece6cdc \"mm/memblock.c: small function definition fixes\"\n\ted7b56a799c \"memblock: Remove memblock_memory_can_coalesce()\"\n\n\tconfliected. The former updates function removed by the\n\tlatter. Resolution is trivial.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "fa8cbaaf5a68f62db3f9a8444ecbb940b47984cb", "tree": "ef8c31c149c7f1fb6c504e7556dab3e56212c539", "parents": [ "3ce21cdfe93efffa4ffba9cf3ca2576d3d60d6dc" ], "author": { "name": "Dan McGee", "email": "dpmcgee@gmail.com", "time": "Mon Oct 17 13:05:23 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Nov 28 11:42:09 2011 +1100" }, "message": "powerpc+sparc64/mm: Remove hack in mmap randomize layout\n\nSince commit 8a0a9bd4db63bc45e301, this comment in mmap_rnd() does not\nhold true as the value returned by get_random_int() will in fact be\n\ndifferent every single call. Remove the comment and simplify the code\nback to its original desired form.\n\nThis reverts commit a5adc91a4b44b5d1 which is no longer necessary and\nalso fixes the sparc code that copied this same adjustment.\n\nSigned-off-by: Dan McGee \u003cdpmcgee@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\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": "efd0bf97deeddd9ba53daabfc470a1399c6b0b2d", "tree": "eec56da5fbc796bac7c67f1990a18f5e0a304059", "parents": [ "f8a15af093b19b86d56933c8757cee298d0f32a8", "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nThe forcedeth changes had a conflict with the conversion over\nto atomic u64 statistics in net-next.\n\nThe libertas cfg.c code had a conflict with the bss reference\ncounting fix by John Linville in net-next.\n\nConflicts:\n\tdrivers/net/ethernet/nvidia/forcedeth.c\n\tdrivers/net/wireless/libertas/cfg.c\n" }, { "commit": "0b64120cceb86e93cb1bda0dc055f13016646907", "tree": "5dcd3444fc219e5b9774734d846b655e0776575b", "parents": [ "3e37fd3153ac95088a74f5e7c569f7567e9f993a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 22:44:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 22:44:58 2011 -0800" }, "message": "sparc64: Patch sun4v code sequences properly on module load.\n\nSome of the sun4v code patching occurs in inline functions visible\nto, and usable by, modules.\n\nTherefore we have to patch them up during module load.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e37fd3153ac95088a74f5e7c569f7567e9f993a", "tree": "60a7f2334034a0294929f645373062620a67145d", "parents": [ "e88d2468718b0789b4c33da2f7e1cef2a1eee279" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 18:17:59 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 18:17:59 2011 -0800" }, "message": "sparc: Kill custom io_remap_pfn_range().\n\nTo handle the large physical addresses, just make a simple wrapper\naround remap_pfn_range() like MIPS does.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\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": "e88d2468718b0789b4c33da2f7e1cef2a1eee279", "tree": "beb5a9eff292f1faa05eb9b96b7f1bd7815da131", "parents": [ "1d299bc7732c34d85bd43ac1a8745f5a2fed2078" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 15 12:57:00 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 15 12:57:00 2011 -0800" }, "message": "sparc: Stash orig_i0 into %g6 instead of %g2\n\nAs per the comments added by this commit, %g2 turns out to not be a\nusable place to save away orig_i0 for syscall restart handling.\n\nIn fact all of %g2, %g3, %g4, and %g5 are assumed to be saved across\na system call by various bits of code in glibc.\n\n%g1 can\u0027t be used because that holds the syscall number, which would\nneed to be saved and restored for syscall restart handling too, and\nthat would only compound our problems :-)\n\nThis leaves us with %g6 and %g7 which are for \"system use\". %g7 is\nused as the \"thread register\" by glibc, but %g6 is used as a compiler\nand assembler temporary scratch register. And in no instance is %g6\nused to hold a value across a system call.\n\nTherefore %g6 is safe for storing away orig_i0, at least for now.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1d299bc7732c34d85bd43ac1a8745f5a2fed2078", "tree": "6a39fe975dd6c18ab0e5efda38ac0a5c04c62863", "parents": [ "9ff03b392fa34f6d549fbb56bf05d8a0483aa818" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 20:32:16 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 20:43:07 2011 -0800" }, "message": "sparc: Fix handling of orig_i0 wrt. debugging when restarting syscalls.\n\nAlthough we provide a proper way for a debugger to control whether\nsyscall restart occurs, we run into problems because orig_i0 is not\nsaved and restored properly.\n\nLuckily we can solve this problem without having to make debuggers\naware of the issue. Across system calls, several registers are\nconsidered volatile and can be safely clobbered.\n\nTherefore we use the pt_regs save area of one of those registers, %g2,\nas a place to save and restore orig_i0.\n\nDebuggers transparently will do the right thing because they save and\nrestore this register already.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9ff03b392fa34f6d549fbb56bf05d8a0483aa818", "tree": "cb9be221c7c7cfe054a3312c36484975508010e0", "parents": [ "52e4c2a05256cb83cda12f3c2137ab1533344edb" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sun Nov 13 07:20:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 13 20:53:25 2011 -0800" }, "message": "sparc: sigutil: Include \u003clinux/errno.h\u003e\n\nThis file introduced in 2.6.32.47 currently fails to compile:\n\narch/sparc/kernel/sigutil_64.c: In function \u0027save_fpu_state\u0027:\narch/sparc/kernel/sigutil_64.c:25: error: \u0027EFAULT\u0027 undeclared (first use in this function)\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\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": "6ccce2b32900a8a6f481036e0cbbfe174742352c", "tree": "b7f214d6d72f2b8c51b2f0587736fc0fa9240cb5", "parents": [ "dccefb3729c8c2b17e45c68cdc0d575f2473a5f0", "51ce185af0f71b65c23ed719f72d0241895a61da" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:02 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc: Hook up process_vm_{readv,writev} syscalls.\n" }, { "commit": "b32fc0a0629bf5894b35f33554c118aacfd0d1e2", "tree": "5d6aaa9a35b7fa63681adab91da3b3dec5276f84", "parents": [ "403299a8515c56db58454c57712f4dc96d6c1fde", "97ce2c88f9ad42e3c60a9beb9fca87abf3639faa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "message": "Merge branch \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n jump-label: initialize jump-label subsystem much earlier\n x86/jump_label: add arch_jump_label_transform_static()\n s390/jump-label: add arch_jump_label_transform_static()\n jump_label: add arch_jump_label_transform_static() to optimise non-live code updates\n sparc/jump_label: drop arch_jump_label_text_poke_early()\n x86/jump_label: drop arch_jump_label_text_poke_early()\n jump_label: if a key has already been initialized, don\u0027t nop it out\n stop_machine: make stop_machine safe and efficient to call early\n jump_label: use proper atomic_t initializer\n\nConflicts:\n - arch/x86/kernel/jump_label.c\n\tAdded __init_or_module to arch_jump_label_text_poke_early vs\n\tremoval of that function entirely\n - kernel/stop_machine.c\n\tsame patch (\"stop_machine: make stop_machine safe and efficient\n\tto call early\") merged twice, with whitespace fix in one version\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561", "tree": "f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a", "parents": [ "addd8c92cf55bba578b8a56e0f717a0a74b31008", "536ec4f8d13433126f948d6e90821f811a4ebdf8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n scsi: drop unused Kconfig symbol\n pci: drop unused Kconfig symbol\n stmmac: drop unused Kconfig symbol\n x86: drop unused Kconfig symbol\n powerpc: drop unused Kconfig symbols\n powerpc: 40x: drop unused Kconfig symbol\n mips: drop unused Kconfig symbols\n openrisc: drop unused Kconfig symbols\n arm: at91: drop unused Kconfig symbol\n samples: drop unused Kconfig symbol\n m32r: drop unused Kconfig symbol\n score: drop unused Kconfig symbols\n sh: drop unused Kconfig symbol\n um: drop unused Kconfig symbol\n sparc: drop unused Kconfig symbol\n alpha: drop unused Kconfig symbol\n\nFix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig\nas per Michal: the STMMAC_DUAL_MAC config variable is still unused and\nshould be deleted.\n" }, { "commit": "b35a35b556f5e6b7993ad0baf20173e75c09ce8c", "tree": "85ea46dde6e97d4c73b724698fd65a403529953e", "parents": [ "e0d85a366c2300efd230ef82a9b22110b0658331" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "thp: share get_huge_page_tail()\n\nThis avoids duplicating the function in every arch gup_fast.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: David 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": "e0d85a366c2300efd230ef82a9b22110b0658331", "tree": "4965cd894ac64947afc7fbb7f5a0303c99e76b28", "parents": [ "0693bc9ce2cc4f6a1b9c3c05790fc149a74c0b87" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Nov 02 13:37:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 02 16:06:58 2011 -0700" }, "message": "sparc: gup_pte_range() support THP based tail recounting\n\nUp to this point the code assumed old refcounting for hugepages (pre-thp).\n This updates the code directly to the thp mapcount tail page refcounting.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: David 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": "51ce185af0f71b65c23ed719f72d0241895a61da", "tree": "4580d15525a4ade85293f633ec26e21560f9f6b4", "parents": [ "094803e0aab3fe75bbf8202a8f4b5280eaade375" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 01 00:51:30 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 01 00:51:30 2011 -0700" }, "message": "sparc: Hook up process_vm_{readv,writev} syscalls.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f060ac5460c5210489197569ef83ad66fc98ace2", "tree": "765ef5caf255a951b1909aa5a1646fd6376ead99", "parents": [ "cdd0b0ac120185ea1adb4dd42ce552617e1cc0d6" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 31 01:50:31 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:54 2011 -0400" }, "message": "sparc: Add module.h to files previously implicitly using it.\n\nThe file mm/extable.c needs module.h for within_module_init(), and\nalso for search_exception_tables [which arguably could be living somewhere\nmore appropriate than module.h] - eventually causing this:\n\narch/sparc/mm/extable.c: In function \u0027trim_init_extable\u0027:\narch/sparc/mm/extable.c:74: error: dereferencing pointer to incomplete type\narch/sparc/mm/extable.c:75: error: dereferencing pointer to incomplete type\narch/sparc/mm/extable.c:77: error: implicit declaration of function \u0027within_module_init\u0027\narch/sparc/mm/extable.c:77: error: dereferencing pointer to incomplete type\narch/sparc/mm/extable.c:78: error: dereferencing pointer to incomplete type\narch/sparc/mm/extable.c:80: error: dereferencing pointer to incomplete type\narch/sparc/mm/extable.c: In function \u0027search_extables_range\u0027:\narch/sparc/mm/extable.c:93: error: implicit declaration of function \u0027search_exception_tables\u0027\n\nThe other instances are more straight forward uses of things\nlike MODULE_* and module_*\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "cdd0b0ac120185ea1adb4dd42ce552617e1cc0d6", "tree": "4347f2deeeba1e74a2d2603cd9e554fb721f0e68", "parents": [ "066bcaca51946c8305e3d637a795e8ccf8dbd3cf" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Jul 22 08:02:24 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:54 2011 -0400" }, "message": "sparc: remove several unnecessary module.h include instances\n\nBuilding an allyesconfig doesn\u0027t reveal a hidden need\nfor any of these. Since module.h brings in the whole kitchen\nsink, it just needlessly adds 30k+ lines to the cpp burden.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "066bcaca51946c8305e3d637a795e8ccf8dbd3cf", "tree": "c500a6f3d9b21ddf25ba3dd3e45a6925e44f8e3f", "parents": [ "7b64db608a441893e180f46fa160e8fae4c5a714" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Jul 22 13:18:16 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:53 2011 -0400" }, "message": "sparc: move symbol exporters to use export.h not module.h\n\nMany of the core sparc kernel files are not modules, but just\nincluding module.h for exporting symbols. Now these files can\nuse the lighter footprint export.h for this role.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "7b64db608a441893e180f46fa160e8fae4c5a714", "tree": "f5918509c7799f7cd1d6ec754e1984093a910431", "parents": [ "cd66bc4539670cadc8442b507f9d5f1a98ce8b7d" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Jul 18 15:57:46 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:52 2011 -0400" }, "message": "sparc: add export.h to arch/sparc files as required\n\nThese files are only exporting symbols, so they don\u0027t need\nthe full module.h header file. Previously they were getting\naccess to EXPORT_SYMBOL implicitly via overuse of module.h\nfrom within other .h files, but that is being cleaned up.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "cd66bc4539670cadc8442b507f9d5f1a98ce8b7d", "tree": "808815f4ddd9541e8549b228e9e46d29fa80af6a", "parents": [ "c2068dabebf83a7ef65ba977a165730fb8b53ef0" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Sep 19 21:15:28 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:52 2011 -0400" }, "message": "sparc: fix implicit use of uaccess.h header in mdesc.c\n\nBuilding sparc64 with the module.h cleanup reveals this implicit\ninclude being taken advantage of:\n\narch/sparc/kernel/mdesc.c: In function \u0027mdesc_read\u0027:\narch/sparc/kernel/mdesc.c:900: error: implicit declaration of function \u0027copy_to_user\u0027\n\nFix it up before the implicit module.h presence is removed.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "c2068dabebf83a7ef65ba977a165730fb8b53ef0", "tree": "976d08c2118cb3cfb3ae3205046d0f13f2a37548", "parents": [ "6a7a5dca0ba4f3a79089ddf5eb7d1abb74a41694" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Aug 01 13:42:48 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:51 2011 -0400" }, "message": "sparc: fix implicit use of spitfire.h in pcr.c and of_device_64.c\n\nTo resolve these on 64bit allnoconfig builds:\n\n CC arch/sparc/kernel/pcr.o\narch/sparc/kernel/pcr.c: In function \u0027register_perf_hsvc\u0027:\narch/sparc/kernel/pcr.c:102: error: \u0027tlb_type\u0027 undeclared (first use in this function)\n\n CC arch/sparc/kernel/of_device_64.o\narch/sparc/kernel/of_device_64.c: In function \u0027build_device_resources\u0027:\narch/sparc/kernel/of_device_64.c:406: error: \u0027tlb_type\u0027 undeclared (first use in this function)\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "1cb85e803ae9f90d91e97cb3856d84b7dde51e06", "tree": "0fdabb4d4a85a32fcfdbf08ed684db886e1cb1d7", "parents": [ "366376151fcd5b99cd8ee78cca1276c132b27b0a" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Mon Oct 24 13:38:16 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Oct 31 23:39:51 2011 +0100" }, "message": "sparc: drop unused Kconfig symbol\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "83f89ca755c9f783b8229d968c4e9d2c660ca427", "tree": "4d29f733c93b232f3a6642a1ea1f78c980ae0a87", "parents": [ "571109f5369efbd3f7d09b4e331c1aa4de3e411a", "2e8ecdc008a16b9a6c4b9628bb64d0d1c05f9f92" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 15:22:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 15:22:16 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc64: Fix masking and shifting in VIS fpcmp emulation.\n sparc32: Correct the return value of memcpy.\n sparc32: Remove uses of %g7 in memcpy implementation.\n sparc32: Remove non-kernel code from memcpy implementation.\n" }, { "commit": "2e8ecdc008a16b9a6c4b9628bb64d0d1c05f9f92", "tree": "dda40d127f783e204e149bdbfe42000ce474a5d4", "parents": [ "a52312b88c8103e965979a79a07f6b34af82ca4b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 31 01:05:49 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 31 01:05:49 2011 -0700" }, "message": "sparc64: Fix masking and shifting in VIS fpcmp emulation.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1448c721e4fa2faf742029a0403b4b787fccb7fa", "tree": "f79332dccc85550b4c16510840850e11115cfff0", "parents": [ "a877ee03ac010ded434b77f7831f43cbb1fcc60f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Oct 17 13:40:02 2011 -0700" }, "committer": { "name": "root", "email": "root@serles.lst.de", "time": "Fri Oct 28 14:58:53 2011 +0200" }, "message": "compat: sync compat_stats with statfs.\n\nThis was found by inspection while tracking a similar\nbug in compat_statfs64, that has been fixed in mainline\nsince decemeber.\n\n- This fixes a bug where not all of the f_spare fields\n were cleared on mips and s390.\n- Add the f_flags field to struct compat_statfs\n- Copy f_flags to userspace in case someone cares.\n- Use __clear_user to copy the f_spare field to userspace\n to ensure that all of the elements of f_spare are cleared.\n On some architectures f_spare is has 5 ints and on some\n architectures f_spare only has 4 ints. Which makes\n the previous technique of clearing each int individually\n broken.\n\nI don\u0027t expect anyone actually uses the old statfs system\ncall anymore but if they do let them benefit from having\nthe compat and the native version working the same.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "92e02396d7214fdc7c25239eb647eb48e6fe6ba9", "tree": "359e3c0df1862e80de93f2f1a631aae2398fc908", "parents": [ "b7e3155818830a358be2b736e1087217c43db9eb" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy.fitzhardinge@citrix.com", "time": "Thu Sep 29 11:11:09 2011 -0700" }, "committer": { "name": "Jeremy Fitzhardinge", "email": "jeremy.fitzhardinge@citrix.com", "time": "Tue Oct 25 11:54:26 2011 -0700" }, "message": "sparc/jump_label: drop arch_jump_label_text_poke_early()\n\nIt is no longer used.\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy.fitzhardinge@citrix.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a52312b88c8103e965979a79a07f6b34af82ca4b", "tree": "65b96c797317eb83ea5779b360cc24227c6d8f89", "parents": [ "21f74d361dfd6a7d0e47574e315f780d8172084a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 19 15:31:55 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 20 15:17:23 2011 -0700" }, "message": "sparc32: Correct the return value of memcpy.\n\nProperly return the original destination buffer pointer.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Kjetil Oftedal \u003coftedal@gmail.com\u003e\n" }, { "commit": "21f74d361dfd6a7d0e47574e315f780d8172084a", "tree": "85649c0b54a6f9deab58bc06b259712edaa78c0f", "parents": [ "045b7de9ca0cf09f1adc3efa467f668b89238390" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 19 15:30:14 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 20 15:17:22 2011 -0700" }, "message": "sparc32: Remove uses of %g7 in memcpy implementation.\n\nThis is setting things up so that we can correct the return\nvalue, so that it properly returns the original destination\nbuffer pointer.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Kjetil Oftedal \u003coftedal@gmail.com\u003e\n" }, { "commit": "045b7de9ca0cf09f1adc3efa467f668b89238390", "tree": "df3fdd26cb3eb4b3259a76cb8091b0763f779570", "parents": [ "fd11e153b82ad1c84ccc71ba1cfedc222465198c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 19 15:15:58 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 20 15:17:22 2011 -0700" }, "message": "sparc32: Remove non-kernel code from memcpy implementation.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Kjetil Oftedal \u003coftedal@gmail.com\u003e\n" }, { "commit": "aad4564498dcb0aad769a79e5e2aa9a661dfb51f", "tree": "c78a9d5396c25fd56b43f8531e87b251a12b1431", "parents": [ "27f20dca01b00eac445e5193565dd185548e7e34" ], "author": { "name": "Kjetil Oftedal", "email": "oftedal@gmail.com", "time": "Wed Oct 19 16:20:50 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 19 16:20:50 2011 -0700" }, "message": "sparc: Add alignment flag to PCI expansion resources\n\nCurrently no type of alignment is specified for PCI expansion roms while \nparsing the openfirmware tree. This causes calls to pci_map_rom() to fail.\nIORESOURCE_SIZEALIGN is the default alignment used for rom resouces in \npci/probe.c, and has been verified to work with various cards on a ultra 10.\n\nSigned-off-By: Kjetil Oftedal \u003coftedal@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27f20dca01b00eac445e5193565dd185548e7e34", "tree": "a12db6c3189464df5adff0d10bfa32e5d0032066", "parents": [ "faddf598f0ba98ba329bb83acad51aea40313c2a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 12 12:27:35 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 12 12:27:35 2011 -0700" }, "message": "sparc: Avoid calling sigprocmask()\n\nUse set_current_blocked() instead.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "faddf598f0ba98ba329bb83acad51aea40313c2a", "tree": "fad64797c8240759caa11b032b8016947f29715f", "parents": [ "f22ed71cd60210d2f476986c0266004e4db45f34" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Thu Aug 11 14:57:02 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 12 12:25:28 2011 -0700" }, "message": "sparc: Use set_current_blocked()\n\nAs described in e6fa16ab (\"signal: sigprocmask() should do\nretarget_shared_pending()\") the modification of current-\u003eblocked is\nincorrect as we need to check whether the signal we\u0027re about to block\nis pending in the shared queue.\n\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f22ed71cd60210d2f476986c0266004e4db45f34", "tree": "ef1b0fd170339ac2fd6bea918a7e20498f61ea16", "parents": [ "3ee72ca99288f1de95ec9c570e43f531c8799f06" ], "author": { "name": "Daniel Hellstrom", "email": "daniel@gaisler.com", "time": "Thu Sep 08 03:11:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 07 12:08:01 2011 -0700" }, "message": "sparc32,leon: SRMMU MMU Table probe fix\n\nThe LEON MMU Model (SRMMU) does not implement MMu Table probing\nin hardware, instead it is implemented in software. However the\nsoftware implementation does not return the PTE as it should which\nalways results in INVALID entires and the PROM mappings are not\ninherited as they should during startup. The following patch\nremoves the masking of the PTE.\n\nSigned-off-by: Daniel Hellstrom \u003cdaniel@gaisler.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f4142cba4e4065a416e78ade905bea29ff3930e6", "tree": "fa0bcfecd234735bfb95b8c6c9c784fad43c3e2f", "parents": [ "11032c17bd3f96a4319e4415c07fc791525b79fd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 29 12:18:59 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 29 12:18:59 2011 -0700" }, "message": "sparc64: Force the execute bit in OpenFirmware\u0027s translation entries.\n\nIn the OF \u0027translations\u0027 property, the template TTEs in the mappings\nnever specify the executable bit. This is the case even though some\nof these mappings are for OF\u0027s code segment.\n\nTherefore, we need to force the execute bit on in every mapping.\n\nThis problem can only really trigger on Niagara/sun4v machines and the\nhistory behind this is a little complicated.\n\nPrevious to sun4v, the sun4u TTE entries lacked a hardware execute\npermission bit. So OF didn\u0027t have to ever worry about setting\nanything to handle executable pages. Any valid TTE loaded into the\nI-TLB would be respected by the chip.\n\nBut sun4v Niagara chips have a real hardware enforced executable bit\nin their TTEs. So it has to be set or else the I-TLB throws an\ninstruction access exception with type code 6 (protection violation).\n\nWe\u0027ve been extremely fortunate to not get bitten by this in the past.\n\nThe best I can tell is that the OF\u0027s mappings for it\u0027s executable code\nwere mapped using permanent locked mappings on sun4v in the past.\nTherefore, the fact that we didn\u0027t have the exec bit set in the OF\ntranslations we would use did not matter in practice.\n\nThanks to Greg Onufer for helping me track this down.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "11032c17bd3f96a4319e4415c07fc791525b79fd", "tree": "1a0a4e57338bcebe34819454b24576e3f0550c4c", "parents": [ "ddd53bf11172822bc02b32b876a491010257d1b0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 21 12:48:06 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 21 12:48:06 2011 -0700" }, "message": "sparc: Make \u0027-p\u0027 boot option meaningful again.\n\nIf \"-p\" is given on the command line, clear the CON_BOOT\nflag for the initial early boot PROM console.\n\nThis is necessary to try and see crash messages that occur\nbetween the registry of the VT console and the probing of\nthe first framebuffer or serial console. During this time\nno console messages are emitted because the VT console\nregistry (even if no backend is registered to it) removes\nthe early console if CON_BOOT is set.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ddd53bf11172822bc02b32b876a491010257d1b0", "tree": "bb6085fe06e245bf1bf7aec4c4f93bdaf2a6bee0", "parents": [ "08cefa9fa7e5b3ddaefb8b7bfa408d148429c08d" ], "author": { "name": "Mathias Krause", "email": "minipli@googlemail.com", "time": "Tue Sep 20 14:22:59 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 20 23:12:42 2011 -0700" }, "message": "sparc, exec: remove redundant addr_limit assignment\n\nThe address limit is already set in flush_old_exec() so this assignment of\nUSER_DS is redundant.\n\nSigned-off-by: Mathias Krause \u003cminipli@googlemail.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "08cefa9fa7e5b3ddaefb8b7bfa408d148429c08d", "tree": "07a33d960d2ce5d72733dd21cf8d179fd06d145a", "parents": [ "1a8e0da5937a6c87807083baa318cf8f98dac9aa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 11 10:42:20 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 16 14:21:33 2011 -0700" }, "message": "sparc64: Future proof Niagara cpu detection.\n\nRecognize T4 and T5 chips. Treating them both as \"T2 plus other\nstuff\" should be extremely safe and make sure distributions will work\nwhen those chips actually ship to customers.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1a8e0da5937a6c87807083baa318cf8f98dac9aa", "tree": "2fabd3b97a5c13c04614ecfea23ad19cc0431626", "parents": [ "0f43dd546d991ca260d8a72d07f617907c508de8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 29 21:14:29 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 29 21:14:29 2011 -0700" }, "message": "sparc64: Only Panther cheetah+ chips have POPC.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "38f7f8f05e8239e9871f7e1c4b0a842080e85315", "tree": "07ec2f9cae65bc299f12f3a1bf32bc28ae121ed7", "parents": [ "2ee04a10697a642ee3b53f0019d3dac7b79f9aae" ], "author": { "name": "Kjetil Oftedal", "email": "oftedal@gmail.com", "time": "Mon Aug 29 00:16:28 2011 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 29 09:20:40 2011 -0700" }, "message": "sparc32,sun4d: Change IPI IRQ level to prevent collision between IPI and timer interrupt\n\nOn Sun4d systems running in SMP mode, IRQ 14 is used for timer interrupts\nand has a specialized interrupt handler. IPI is currently set to use IRQ 14\nas well, which causes it to trigger the timer interrupt handler, and not the\nIPI interrupt handler.\n\nThe IPI interrupt is therefore changed to IRQ 13, which is the highest\nnormally handled interrupt. This IRQ is also used for SBUS interrupts,\nhowever there is nothing in the IPI/SBUS interrupt handlers that indicate\nthat they will not handle sharing the interrupt.\n(IRQ 13 is indicated as audio interrupt, which is unlikely to be found in a\nsun4d system)\n\nSigned-off-by: Kjetil Oftedal \u003coftedal@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2ee04a10697a642ee3b53f0019d3dac7b79f9aae", "tree": "939696abc08bf9762397a4cb6480da3200d44861", "parents": [ "c6a389f123b9f68d605bb7e0f9b32ec1e3e14132" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Mon Aug 29 15:43:40 2011 +1000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 29 09:19:24 2011 -0700" }, "message": "sparc: Remove another reference to nfsservctl\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "5598473a5b40c47a8c5349dd2c2630797169cf1a", "tree": "514474c6359d158fe1adc7477dbcf64c326b1770", "parents": [ "4a0342ca8e8150bd47e7118a76e300692a1b6b7b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 20 17:14:54 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 20 17:14:54 2011 -0700" }, "message": "sparc: Allow handling signals when stack is corrupted.\n\nIf we can\u0027t push the pending register windows onto the user\u0027s stack,\nwe disallow signal delivery even if the signal would be delivered on a\nvalid seperate signal stack.\n\nAdd a register window save area in the signal frame, and store any\nunsavable windows there.\n\nOn sigreturn, if any windows are still queued up in the signal frame,\ntry to push them back onto the stack and if that fails we kill the\nprocess immediately.\n\nThis allows the debug/tst-longjmp_chk2 glibc test case to pass.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4a0342ca8e8150bd47e7118a76e300692a1b6b7b", "tree": "01ba05e32c4a404e8dc46df4996089e782bdd714", "parents": [ "178a29600340bef5b13cd4157053679debe35351" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Wed Aug 17 22:14:57 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 18 21:47:40 2011 -0700" }, "message": "sparc: fix array bounds error setting up PCIC NMI trap\n\n CC arch/sparc/kernel/pcic.o\narch/sparc/kernel/pcic.c: In function \u0027pcic_probe\u0027:\narch/sparc/kernel/pcic.c:359:33: error: array subscript is above array bounds [-Werror\u003darray-bounds]\narch/sparc/kernel/pcic.c:359:8: error: array subscript is above array bounds [-Werror\u003darray-bounds]\narch/sparc/kernel/pcic.c:360:33: error: array subscript is above array bounds [-Werror\u003darray-bounds]\narch/sparc/kernel/pcic.c:360:8: error: array subscript is above array bounds [-Werror\u003darray-bounds]\narch/sparc/kernel/pcic.c:361:33: error: array subscript is above array bounds [-Werror\u003darray-bounds]\narch/sparc/kernel/pcic.c:361:8: error: array subscript is above array bounds [-Werror\u003darray-bounds]\ncc1: all warnings being treated as errors\n\nI\u0027m not particularly familiar with sparc but t_nmi (defined in head_32.S via\nthe TRAP_ENTRY macro) and pcic_nmi_trap_patch (defined in entry.S) both appear\nto be 4 instructions long and I presume from the usage that instructions are\nint sized.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: sparclinux@vger.kernel.org\nReviewed-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "178a29600340bef5b13cd4157053679debe35351", "tree": "96a5ccdfd954b3120c72e258e395498208a3e37b", "parents": [ "3f6aa0b113846a8628baa649af422cfc6fb1d786" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 15 14:45:17 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 15 14:45:17 2011 -0700" }, "message": "sparc64: Set HAVE_C_RECORDMCOUNT\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f6aa0b113846a8628baa649af422cfc6fb1d786", "tree": "5b3d1f9b112a779dab37db5f685c24e5e857df96", "parents": [ "a0fba3eb059e73fed2d376a901f8117734c12f1f" ], "author": { "name": "Mikael Pettersson", "email": "mikpe@it.uu.se", "time": "Mon Aug 15 10:11:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 15 14:35:19 2011 -0700" }, "message": "sparc32: unbreak arch_write_unlock()\n\nThe sparc32 version of arch_write_unlock() is just a plain assignment.\nUnfortunately this allows the compiler to schedule side-effects in a\nprotected region to occur after the HW-level unlock, which is broken.\nE.g., the following trivial test case gets miscompiled:\n\n\t#include \u003clinux/spinlock.h\u003e\n\trwlock_t lock;\n\tint counter;\n\tvoid foo(void) { write_lock(\u0026lock); ++counter; write_unlock(\u0026lock); }\n\nFixed by adding a compiler memory barrier to arch_write_unlock(). The\nsparc64 version combines the barrier and assignment into a single asm(),\nand implements the operation as a static inline, so that\u0027s what I did too.\n\nCompile-tested with sparc32_defconfig + CONFIG_SMP\u003dy.\n\nSigned-off-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a0fba3eb059e73fed2d376a901f8117734c12f1f", "tree": "b01928a3218da7abbbc9881fdf6c18cd4c6524a2", "parents": [ "73e0881d31406acc09eb11fa073108b43c89124e" ], "author": { "name": "Mikael Pettersson", "email": "mikpe@it.uu.se", "time": "Mon Aug 15 10:10:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 15 14:35:18 2011 -0700" }, "message": "sparc64: remove unnecessary macros from spinlock_64.h\n\nThe sparc64 spinlock_64.h contains a number of operations defined\nfirst as static inline functions, and then as macros with the same\nnames and parameters as the functions. Maybe this was needed at\nsome point in the past, but now nothing seems to depend on these\nmacros (checked with a recursive grep looking for ifdefs on these\nnames). Other archs don\u0027t define these identity-macros.\n\nSo this patch deletes these unnecessary macros.\n\nCompile-tested with sparc64_defconfig.\n\nSigned-off-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c92761fd9efcbbcb59e7bf4db88e29ce03229889", "tree": "0f702eb5c37fa4c70c9fbee066ca07c0f2b75b97", "parents": [ "9e23311345135083f6074b280de1e6dc5eee1f68" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 11 17:58:59 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 11 17:58:59 2011 -0700" }, "message": "sparc: Don\u0027t do hypervisor calls on non-sun4v in DS driver.\n\nReported-by: Pieter-Paul Giesberts \u003cpieterpg@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0785a8e87be0202744d8681363aecbd4ffbb5f5a", "tree": "8ebfb5a988dd497a9103b07ec2897b7ac1462062", "parents": [ "de96355c111679dd6e2c5c73e25e814c72510c58" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 06 05:26:35 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 06 05:26:35 2011 -0700" }, "message": "sparc: Fix build with DEBUG_PAGEALLOC enabled.\n\narch/sparc/mm/init_64.c:1622:22: error: unused variable \u0027__swapper_4m_tsb_phys_patch_end\u0027 [-Werror\u003dunused-variable]\narch/sparc/mm/init_64.c:1621:22: error: unused variable \u0027__swapper_4m_tsb_phys_patch\u0027 [-Werror\u003dunused-variable]\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8cd290a07d095f3b354e3448bcd7757393c29cd5", "tree": "af33cb7677646bc506f1fae34676834dc45584a4", "parents": [ "07d952dc669bb70a9716a81e140e89b7d4969f09", "961f65fc41cdc1f9099a6075258816c0db98e390" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 05 06:42:36 2011 -1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 05 06:42:36 2011 -1000" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc: Size mondo queues more sanely.\n sparc: Access kernel TSB using physical addressing when possible.\n sparc: Fix __atomic_add_unless() return value.\n sparc: use kbuild-generic support for true asm-generic header files\n sparc: Use popc when possible for ffs/__ffs/ffz.\n sparc: Set reboot-cmd using reboot data hypervisor call if available.\n sparc: Add some missing hypervisor API groups.\n sparc: Use hweight64() in popc emulation.\n sparc: Use popc if possible for hweight routines.\n sparc: Minor tweaks to Niagara page copy/clear.\n sparc: Sanitize cpu feature detection and reporting.\n" } ], "next": "961f65fc41cdc1f9099a6075258816c0db98e390" }