)]}' { "log": [ { "commit": "03240b279dbbda41f2fc55ff4424acf651e25bef", "tree": "9d50a4d801bd05532dfc9eecdb5c8cb56323a6bd", "parents": [ "9171c670b4915e30360c2aed530b8377fbbcc852" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jun 04 17:47:34 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jun 04 17:47:34 2012 -0400" }, "message": "fixups for signal breakage\n\nObvious brainos spotted by Geert.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "86c47b70f62a7072d441ba212aab33c2f82627c2", "tree": "d03988bd2226966352bb7f3c2e82ff545353d2c4", "parents": [ "1193755ac6328ad240ba987e6ec41d5e8baf0680", "44fbbb3dc687c9709a6f2236197316e5c79ab1eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 11:53:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 11:53:44 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull third pile of signal handling patches from Al Viro:\n \"This time it\u0027s mostly helpers and conversions to them; there\u0027s a lot\n of stuff remaining in the tree, but that\u0027ll either go in -rc2\n (isolated bug fixes, ideally via arch maintainers\u0027 trees) or will sit\n there until the next cycle.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n x86: get rid of calling do_notify_resume() when returning to kernel mode\n blackfin: check __get_user() return value\n whack-a-mole with TIF_FREEZE\n FRV: Optimise the system call exit path in entry.S [ver #2]\n FRV: Shrink TIF_WORK_MASK [ver #2]\n FRV: Prevent syscall exit tracing and notify_resume at end of kernel exceptions\n new helper: signal_delivered()\n powerpc: get rid of restore_sigmask()\n most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set\n set_restore_sigmask() is never called without SIGPENDING (and never should be)\n TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set\n don\u0027t call try_to_freeze() from do_signal()\n pull clearing RESTORE_SIGMASK into block_sigmask()\n sh64: failure to build sigframe !\u003d signal without handler\n openrisc: tracehook_signal_handler() is supposed to be called on success\n new helper: sigmask_to_save()\n new helper: restore_saved_sigmask()\n new helpers: {clear,test,test_and_clear}_restore_sigmask()\n HAVE_RESTORE_SIGMASK is defined on all architectures now\n" }, { "commit": "1193755ac6328ad240ba987e6ec41d5e8baf0680", "tree": "40bf847d7e3ebaa57b107151d14e6cd1d280cc6d", "parents": [ "4edebed86690eb8db9af3ab85baf4a34e73266cc", "0ef97dcfce4179a2eba046b855ee2f91d6f1b414" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 10:34:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 01 10:34:35 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs changes from Al Viro.\n \"A lot of misc stuff. The obvious groups:\n * Miklos\u0027 atomic_open series; kills the damn abuse of\n -\u003ed_revalidate() by NFS, which was the major stumbling block for\n all work in that area.\n * ripping security_file_mmap() and dealing with deadlocks in the\n area; sanitizing the neighborhood of vm_mmap()/vm_munmap() in\n general.\n * -\u003eencode_fh() switched to saner API; insane fake dentry in\n mm/cleancache.c gone.\n * assorted annotations in fs (endianness, __user)\n * parts of Artem\u0027s -\u003es_dirty work (jff2 and reiserfs parts)\n * -\u003eupdate_time() work from Josef.\n * other bits and pieces all over the place.\n\n Normally it would\u0027ve been in two or three pull requests, but\n signal.git stuff had eaten a lot of time during this cycle ;-/\"\n\nFix up trivial conflicts in Documentation/filesystems/vfs.txt (the\n\u0027truncate_range\u0027 inode method was removed by the VM changes, the VFS\nupdate adds an \u0027update_time()\u0027 method), and in fs/btrfs/ulist.[ch] (due\nto sparse fix added twice, with other changes nearby).\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (95 commits)\n nfs: don\u0027t open in -\u003ed_revalidate\n vfs: retry last component if opening stale dentry\n vfs: nameidata_to_filp(): don\u0027t throw away file on error\n vfs: nameidata_to_filp(): inline __dentry_open()\n vfs: do_dentry_open(): don\u0027t put filp\n vfs: split __dentry_open()\n vfs: do_last() common post lookup\n vfs: do_last(): add audit_inode before open\n vfs: do_last(): only return EISDIR for O_CREAT\n vfs: do_last(): check LOOKUP_DIRECTORY\n vfs: do_last(): make ENOENT exit RCU safe\n vfs: make follow_link check RCU safe\n vfs: do_last(): use inode variable\n vfs: do_last(): inline walk_component()\n vfs: do_last(): make exit RCU safe\n vfs: split do_lookup()\n Btrfs: move over to use -\u003eupdate_time\n fs: introduce inode operation -\u003eupdate_time\n reiserfs: get rid of resierfs_sync_super\n reiserfs: mark the superblock as dirty a bit later\n ...\n" }, { "commit": "efee984c27b67e3ebef40410f35671997441b57c", "tree": "53457dba2338f853d34e1754e7f7f960e4a29482", "parents": [ "17440f171e28e86cc21a4c8fd1fa3c561503f80e" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Apr 28 02:04:15 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:52 2012 -0400" }, "message": "new helper: signal_delivered()\n\nDoes block_sigmask() + tracehook_signal_handler(); called when\nsigframe has been successfully built. All architectures converted\nto it; block_sigmask() itself is gone now (merged into this one).\n\nI\u0027m still not too happy with the signature, but that\u0027s a separate\nstory (IMO we need a structure that would contain signal number +\nsiginfo + k_sigaction, so that get_signal_to_deliver() would fill one,\nsignal_delivered(), handle_signal() and probably setup...frame() -\ntake one).\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "77097ae503b170120ab66dd1d547f8577193f91f", "tree": "bee5b2e8d91b9ec8ab74c58cbec1796c7bacc2e5", "parents": [ "edd63a2763bdae0daa4f0a4d4c5d61d1154352a5" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Apr 27 13:58:59 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:51 2012 -0400" }, "message": "most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set\n\nOnly 3 out of 63 do not. Renamed the current variant to __set_current_blocked(),\nadded set_current_blocked() that will exclude unblockable signals, switched\nopen-coded instances to it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6fd84c0831ec78d98736b76dc5e9b849f1dbfc9e", "tree": "d3d95e7a66f6edcd29cfc4f2ff01aec8422b5a88", "parents": [ "bf343dfd877ebf16cfbc31ba121606c5b6cef01f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 15:28:58 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:50 2012 -0400" }, "message": "TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a610d6e672d6d3723e8da257ad4a8a288a8f2f89", "tree": "2fac6ce7f72756771f4f87583205cc402589dcad", "parents": [ "5754f412a3f107cbcd93ee125bef296f2a07539b" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:42:15 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:49 2012 -0400" }, "message": "pull clearing RESTORE_SIGMASK into block_sigmask()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b7f9a11a6cf1ea9ee6be3eb2b90d91327a09ad14", "tree": "7d5a5f469aea8ac2b3e1ab41e05a6abafcb2b694", "parents": [ "51a7b448d4134e3e8eec633435e3e8faee14a828" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 02 09:59:21 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:48 2012 -0400" }, "message": "new helper: sigmask_to_save()\n\nreplace boilerplate \"should we use -\u003esaved_sigmask or -\u003eblocked?\"\nwith calls of obvious inlined helper...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "51a7b448d4134e3e8eec633435e3e8faee14a828", "tree": "8fc58560ffee1c944ec5e198029d5c2e6f7c0bd3", "parents": [ "4ebefe3ec729003443daf153ed6fad1739271283" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:33:55 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:47 2012 -0400" }, "message": "new helper: restore_saved_sigmask()\n\nfirst fruits of ..._restore_sigmask() helpers: now we can take\nboilerplate \"signal didn\u0027t have a handler, clear RESTORE_SIGMASK\nand restore the blocked mask from -\u003esaved_mask\" into a common\nhelper. Open-coded instances switched...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "fb21affa49204acd409328415b49bfe90136653c", "tree": "3535dbe0c0aad049a38cadfcffe78409397a1b32", "parents": [ "a00b6151a2ae4c52576c35d3998e144a993d50b8", "f23ca335462e3c84f13270b9e65f83936068ec2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull second pile of signal handling patches from Al Viro:\n \"This one is just task_work_add() series + remaining prereqs for it.\n\n There probably will be another pull request from that tree this\n cycle - at least for helpers, to get them out of the way for per-arch\n fixes remaining in the tree.\"\n\nFix trivial conflict in kernel/irq/manage.c: the merge of Andrew\u0027s pile\nhad brought in commit 97fd75b7b8e0 (\"kernel/irq/manage.c: use the\npr_foo() infrastructure to prefix printks\") which changed one of the\npr_err() calls that this merge moves around.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n keys: kill task_struct-\u003ereplacement_session_keyring\n keys: kill the dummy key_replace_session_keyring()\n keys: change keyctl_session_to_parent() to use task_work_add()\n genirq: reimplement exit_irq_thread() hook via task_work_add()\n task_work_add: generic process-context callbacks\n avr32: missed _TIF_NOTIFY_RESUME on one of do_notify_resume callers\n parisc: need to check NOTIFY_RESUME when exiting from syscall\n move key_repace_session_keyring() into tracehook_notify_resume()\n TIF_NOTIFY_RESUME is defined on all targets now\n" }, { "commit": "bb8ac181a5cf50458a0d83b4460790badc9fdc16", "tree": "d55493f9ca94516a0aa83dd8ee1d87c2a88d637b", "parents": [ "1dfb5751a4de7c6a57a5602e8e2b87267cfc8c81" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat May 19 10:25:23 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 30 21:04:50 2012 -0400" }, "message": "bury __kernel_nlink_t, make internal nlink_t consistent\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "07acfc2a9349a8ce45b236c2624dad452001966b", "tree": "c40f3eaac18a8320e65af220979223b5cd632b1b", "parents": [ "b5f4035adfffbcc6b478de5b8c44b618b3124aff", "322728e55aa7834e2fab2786b76df183c4843a12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 16:17:30 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM changes from Avi Kivity:\n \"Changes include additional instruction emulation, page-crossing MMIO,\n faster dirty logging, preventing the watchdog from killing a stopped\n guest, module autoload, a new MSI ABI, and some minor optimizations\n and fixes. Outside x86 we have a small s390 and a very large ppc\n update.\n\n Regarding the new (for kvm) rebaseless workflow, some of the patches\n that were merged before we switch trees had to be rebased, while\n others are true pulls. In either case the signoffs should be correct\n now.\"\n\nFix up trivial conflicts in Documentation/feature-removal-schedule.txt\narch/powerpc/kvm/book3s_segment.S and arch/x86/include/asm/kvm_para.h.\n\nI suspect the kvm_para.h resolution ends up doing the \"do I have cpuid\"\ncheck effectively twice (it was done differently in two different\ncommits), but better safe than sorry ;)\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (125 commits)\n KVM: make asm-generic/kvm_para.h have an ifdef __KERNEL__ block\n KVM: s390: onereg for timer related registers\n KVM: s390: epoch difference and TOD programmable field\n KVM: s390: KVM_GET/SET_ONEREG for s390\n KVM: s390: add capability indicating COW support\n KVM: Fix mmu_reload() clash with nested vmx event injection\n KVM: MMU: Don\u0027t use RCU for lockless shadow walking\n KVM: VMX: Optimize %ds, %es reload\n KVM: VMX: Fix %ds/%es clobber\n KVM: x86 emulator: convert bsf/bsr instructions to emulate_2op_SrcV_nobyte()\n KVM: VMX: unlike vmcs on fail path\n KVM: PPC: Emulator: clean up SPR reads and writes\n KVM: PPC: Emulator: clean up instruction parsing\n kvm/powerpc: Add new ioctl to retreive server MMU infos\n kvm/book3s: Make kernel emulated H_PUT_TCE available for \"PR\" KVM\n KVM: PPC: bookehv: Fix r8/r13 storing in level exception handler\n KVM: PPC: Book3S: Enable IRQs during exit handling\n KVM: PPC: Fix PR KVM on POWER7 bare metal\n KVM: PPC: Fix stbux emulation\n KVM: PPC: bookehv: Use lwz/stw instead of PPC_LL/PPC_STL for 32-bit fields\n ...\n" }, { "commit": "b1bf7d4d1b3911352cf1ec63c1de06214288ccd0", "tree": "0fd27c638977cb5c7e6e3f95085ce842b57a4ae3", "parents": [ "0708500d49e8439d9fe5529795bdc1485f0f46c3", "3e11f7b840b4671213c66817294ad7dd0b572756" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 14:01:46 2012 -0700" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull GPIO driver changes from Grant Likely:\n \"Lots of gpio changes, both to core code and drivers.\n\n Changes do touch architecture code to remove the need for separate\n arm/gpio.h includes in most architectures.\n\n Some new drivers are added, and a number of gpio drivers are converted\n to use irq_domains for gpio inputs used as interrupts. Device tree\n support has been amended to allow multiple gpio_chips to use the same\n device tree node.\n\n Remaining changes are primarily bug fixes.\"\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (33 commits)\n gpio/generic: initialize basic_mmio_gpio shadow variables properly\n gpiolib: Remove \u0027const\u0027 from data argument of gpiochip_find()\n gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583\n gpiolib: quiet gpiochip_add boot message noise\n gpio: mpc8xxx: Prevent NULL pointer deref in demux handler\n gpio/lpc32xx: Add device tree support\n gpio: Adjust of_xlate API to support multiple GPIO chips\n gpiolib: Implement devm_gpio_request_one()\n gpio-mcp23s08: dbg_show: fix pullup configuration display\n Add support for TCA6424A\n gpio/omap: (re)fix wakeups on level-triggered GPIOs\n gpio/omap: fix broken context restore for non-OFF mode transitions\n gpio/omap: fix missing check in *_runtime_suspend()\n gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()\n gpio/omap: remove suspend/resume callbacks\n gpio/omap: remove retrigger variable in gpio_irq_handler\n gpio/omap: remove saved_wakeup field from struct gpio_bank\n gpio/omap: remove suspend_wakeup field from struct gpio_bank\n gpio/omap: remove saved_fallingdetect, saved_risingdetect\n gpio/omap: remove virtual_irq_start variable\n ...\n\nConflicts:\n\tdrivers/gpio/gpio-samsung.c\n" }, { "commit": "c7523a7c88db637d66841018532cb4b3ab6ab0a8", "tree": "cec08263a493831d43e17d4daa633e2a6b09480e", "parents": [ "2f78d8e249973f1eeb88315e6444e616c60177ae", "b80fe1015be4e3c926d8eb4cc6a340fdd22a43e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 13:29:46 2012 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer updates from Thomas Gleixner.\n\nVarious trivial conflict fixups in arch Kconfig due to addition of\nunrelated entries nearby. And one slightly more subtle one for sparc32\n(new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas.\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)\n timekeeping: Fix a few minor newline issues.\n time: remove obsolete declaration\n ntp: Fix a stale comment and a few stray newlines.\n ntp: Correct TAI offset during leap second\n timers: Fixup the Kconfig consolidation fallout\n x86: Use generic time config\n unicore32: Use generic time config\n um: Use generic time config\n tile: Use generic time config\n sparc: Use: generic time config\n sh: Use generic time config\n score: Use generic time config\n s390: Use generic time config\n openrisc: Use generic time config\n powerpc: Use generic time config\n mn10300: Use generic time config\n mips: Use generic time config\n microblaze: Use generic time config\n m68k: Use generic time config\n m32r: Use generic time config\n ...\n" }, { "commit": "62366c88b29c5a32e1531142092f98eaf49b1103", "tree": "87373c6c3a56d52a4b8ecc7c8878b870a4a5ab26", "parents": [ "617c62a9fc157c5dbb3c90945da5535e5b0a7f4c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 15:14:10 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 22:09:21 2012 -0400" }, "message": "avr32: missed _TIF_NOTIFY_RESUME on one of do_notify_resume callers\n\nwe need that not just on syscall returns but on irq ones as well...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a42c6ded827dbd396d2efde7530620be029a72d1", "tree": "ea3129404f32515a04497990a050b2cf73aa1d5d", "parents": [ "1227dd773d8d4e3983b4b751f9ffa0f41402fb7c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 14:44:37 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 22:09:20 2012 -0400" }, "message": "move key_repace_session_keyring() into tracehook_notify_resume()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f9369910a6225b8d4892c3f20ae740a711cd5ace", "tree": "8650ff79d7607bceb35509c028400ecf1c317de0", "parents": [ "05f144a0d5c2207a0349348127f996e104ad7404", "415d04d08fec74b226c92c1fb54ad117c9c6bac4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 18:11:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 18:11:45 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull first series of signal handling cleanups from Al Viro:\n \"This is just the first part of the queue (about a half of it);\n assorted fixes all over the place in signal handling.\n\n This one ends with all sigsuspend() implementations switched to\n generic one (-\u003esaved_sigmask-based).\n\n With this, a bunch of assorted old buglets are fixed and most of the\n missing bits of NOTIFY_RESUME hookup are in place. Two more fixes sit\n in arm and um trees respectively, and there\u0027s a couple of broken ones\n that need obvious fixes - parisc and avr32 check TIF_NOTIFY_RESUME\n only on one of two codepaths; fixes for that will happen in the next\n series\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (55 commits)\n unicore32: if there\u0027s no handler we need to restore sigmask, syscall or no syscall\n xtensa: add handling of TIF_NOTIFY_RESUME\n microblaze: drop \u0027oldset\u0027 argument of do_notify_resume()\n microblaze: handle TIF_NOTIFY_RESUME\n score: add handling of NOTIFY_RESUME to do_notify_resume()\n m68k: add TIF_NOTIFY_RESUME and handle it.\n sparc: kill ancient comment in sparc_sigaction()\n h8300: missing checks of __get_user()/__put_user() return values\n frv: missing checks of __get_user()/__put_user() return values\n cris: missing checks of __get_user()/__put_user() return values\n powerpc: missing checks of __get_user()/__put_user() return values\n sh: missing checks of __get_user()/__put_user() return values\n sparc: missing checks of __get_user()/__put_user() return values\n avr32: struct old_sigaction is never used\n m32r: struct old_sigaction is never used\n xtensa: xtensa_sigaction doesn\u0027t exist\n alpha: tidy signal delivery up\n score: don\u0027t open-code force_sigsegv()\n cris: don\u0027t open-code force_sigsegv()\n blackfin: don\u0027t open-code force_sigsegv()\n ...\n" }, { "commit": "ec0d7f18ab7b5097d7c0c8f3d909ca1031b9d5cd", "tree": "7d62c924592145f819ecaa5d60460a05a10dfdbd", "parents": [ "269af9a1a08d368b46d72e74126564d04c354f7e", "1dcc8d7ba235a316a056f993e88f0d18b92c60d9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "message": "Merge branch \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull fpu state cleanups from Ingo Molnar:\n \"This tree streamlines further aspects of FPU handling by eliminating\n the prepare_to_copy() complication and moving that logic to\n arch_dup_task_struct().\n\n It also fixes the FPU dumps in threaded core dumps, removes and old\n (and now invalid) assumption plus micro-optimizes the exit path by\n avoiding an FPU save for dead tasks.\"\n\nFixed up trivial add-add conflict in arch/sh/kernel/process.c that came\nin because we now do the FPU handling in arch_dup_task_struct() rather\nthan the legacy (and now gone) prepare_to_copy().\n\n* \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, fpu: drop the fpu state during thread exit\n x86, xsave: remove thread_has_fpu() bug check in __sanitize_i387_state()\n coredump: ensure the fpu state is flushed for proper multi-threaded core dump\n fork: move the real prepare_to_copy() users to arch_dup_task_struct()\n" }, { "commit": "9a07880222b6e50cee2c2d66270cff0c34bfe7b8", "tree": "2eb4bdf1f5bdca46b5f7be6cfb6c6870b2c21848", "parents": [ "fe2eff8b87a3b33efd1bb30bb775cef71eaca34d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Apr 22 16:21:28 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:59:20 2012 -0400" }, "message": "avr32: struct old_sigaction is never used\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "fe49c1cebf054d5c797ecd6b91d5bf96d4295fe4", "tree": "38b78aa337342df262e7fec1a234c3f126937739", "parents": [ "ae28b38ca14122b990a83bf4ef95a12889cc6b92" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 02 09:52:37 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:58:08 2012 -0400" }, "message": "avr32: need to clear RESTORE_SIGMASK on successful signal delivery\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "446cdd13275bfa38b858a1e99dbd61c07c9767c0", "tree": "8312ba0e7d3bdb31a28ea62c9683fbb196f92c40", "parents": [ "188f677f84e935f83e3d539d6e8808006f6ac62f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Apr 22 03:36:05 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:52:40 2012 -0400" }, "message": "avr32: -\u003erestart_block.fn needs to be reset on rt_sigreturn\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "54bbf3e3a9af5e3c439766fda444fb0673a1a721", "tree": "da0bf37a06a10c83032ac45de70b2c323674030c", "parents": [ "49209590cb1cdd30b35edd65535184e39bfbab99" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Fri May 11 10:57:58 2012 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:52:37 2012 -0400" }, "message": "avr32: use block_sigmask()\n\nUse the new helper function introduced in commit 5e6292c0f28f (\"signal:\nadd block_sigmask() for adding sigmask to current-\u003eblocked\") which\ncentralises the code for updating current-\u003eblocked after successfully\ndelivering a signal and reduces the amount of duplicate code across\narchitectures.\n\nIn the past some architectures got this code wrong, so using this helper\nfunction should stop that from happening again.\n\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Havard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "49209590cb1cdd30b35edd65535184e39bfbab99", "tree": "c23f46a276ed0b04abe85b6ab460c7133d4e3d21", "parents": [ "e1b1fd79a04396d5ec971e9e4d4711b5a58ad7e3" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri May 11 10:57:58 2012 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:52:36 2012 -0400" }, "message": "avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn\n\nIt is wrong to change -\u003eblocked directly, see e6fa16ab. Change\nhandle_signal() and sys_rt_sigreturn() to use the right helper,\nset_current_blocked().\n\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nAcked-by: Havard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nReviewed-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "e1b1fd79a04396d5ec971e9e4d4711b5a58ad7e3", "tree": "24e80e0321f62439950fb11357f44cf46eafc4e8", "parents": [ "3883e301bf05457d09ffc16c03ead6182ac3d732" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Fri May 11 10:57:57 2012 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon May 21 23:52:36 2012 -0400" }, "message": "avr32: don\u0027t mask signals in the error path\n\nThe current handle_signal() implementation is broken - it will mask\nsignals if we fail to setup the signal stack frame, which isn\u0027t the\ndesired behaviour, we should only be masking signals if we succeed in\nsetting up the stack frame. It looks like this code was copied from the\nold (broken) arm implementation but wasn\u0027t updated when the arm code was\nfixed in commit a6c61e9dfdd0 (\"[ARM] 3168/1: Update ARM signal delivery\nand masking\").\n\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nAcked-by: Havard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "764e0da14fd7ac2d259d98d34ece0a87d32306c9", "tree": "3d1c3065ca2f140f065c15c0b9645703241c68e7", "parents": [ "bdebaf80a02b854381fe212e0dac13c8c8edac57" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 23:16:18 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 23:43:46 2012 +0200" }, "message": "timers: Fixup the Kconfig consolidation fallout\n\nSigh, I missed to check which architecture Kconfig files actually\ninclude the core Kconfig file. There are a few which did not. So we\nbroke them.\n\nInstead of adding the includes to those, we are better off to move the\ninclude to init/Kconfig like we did already with irqs and others.\n\nThis does not change anything for the architectures using the old\nstyle periodic timer mode. It just solves the build wreckage there.\n\nFor those architectures which use the clock events infrastructure it\nmoves the include of the core Kconfig file to \"General setup\" which is\na way more logical place than having it at random locations specified\nby the architecture specific Kconfigs.\n\nReported-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Anna-Maria Gleixner \u003canna-maria@glx-um.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "8d6af9914cacfbb60537cf5c46f9ebfc26ff2440", "tree": "d395090780bbbfb78a44b99c8316eb0e443dad0b", "parents": [ "3d92a71a4467681ef6a47e10447d200b52c78af8" ], "author": { "name": "Anna-Maria Gleixner", "email": "anna-maria@glx-um.de", "time": "Fri May 18 16:45:45 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 21 11:01:41 2012 +0200" }, "message": "avr32: Use generic time config\n\nSigned-off-by: Anna-Maria Gleixner \u003canna-maria@glx-um.de\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nLink: http://lkml.kernel.org/r/20120518163104.889514832@glx-um.de\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "55ccf3fe3f9a3441731aa79cf42a628fc4ecace9", "tree": "fc1baa880f32e9da083998bda8aefc335846fd52", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 16 15:03:51 2012 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Wed May 16 15:16:26 2012 -0700" }, "message": "fork: move the real prepare_to_copy() users to arch_dup_task_struct()\n\nHistorical prepare_to_copy() is mostly a no-op, duplicated for majority of\nthe architectures and the rest following the x86 model of flushing the extended\nregister state like fpu there.\n\nRemove it and use the arch_dup_task_struct() instead.\n\nSuggested-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSuggested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/1336692811-30576-1-git-send-email-suresh.b.siddha@intel.com\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nCc: Aurelien Jacquiot \u003ca-jacquiot@ti.com\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCc: Richard Kuo \u003crkuo@codeaurora.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nCc: James E.J. Bottomley \u003cjejb@parisc-linux.org\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: Lennox Wu \u003clennox.wu@gmail.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Richard Weinberger \u003crichard@nod.at\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "7563bbf89d065a2c3f05059ecbcc805645edcc62", "tree": "2b8231e8145a73cce0da67ce38e0360fcd0a802e", "parents": [ "25cf25073a4e1e0563c288908481f10f98acb19a" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sun Apr 15 10:52:54 2012 +0100" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 11 18:00:14 2012 -0600" }, "message": "gpiolib/arches: Centralise bolierplate asm/gpio.h\n\nRather than requiring architectures that use gpiolib but don\u0027t have any\nneed to define anything custom to copy an asm/gpio.h provide a Kconfig\nsymbol which architectures must select in order to include gpio.h and\nfor other architectures just provide the trivial implementation directly.\n\nThis makes it much easier to do gpiolib updates and is also a step towards\nmaking gpiolib APIs available on every architecture.\n\nFor architectures with existing boilerplate code leave a stub header in\nplace which warns on direct inclusion of asm/gpio.h and includes\nlinux/gpio.h to catch code that\u0027s doing this. Direct inclusion of\nasm/gpio.h has long been deprecated.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a6359d1eec43d1fd6ffbac958149844873e0084f", "tree": "cbb9681ac4f34c6653064ecbd1bdda8f910d40a2", "parents": [ "e4d59621923ba6c42f30a9d74c7c78d101c2f7aa" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 03 09:03:02 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 13:00:46 2012 +0200" }, "message": "init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK\n\nNow that all archs except ia64 are converted, replace the config and\nlet the ia64 select CONFIG_ARCH_INIT_TASK\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120503085035.867948914@linutronix.de\n\n" }, { "commit": "29b2501bd8bb55822dcdd0b1ad82fe44d44eaa73", "tree": "1785bacf042788c4caeabb362e37288d81beeb2b", "parents": [ "5290dc292915aaed6ae71ec3db5d4aa3285e7d51" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 03 09:02:51 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 13:00:22 2012 +0200" }, "message": "avr32: Use generic init_task\n\nSame code. Use the generic version.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nLink: http://lkml.kernel.org/r/20120503085034.281527118@linutronix.de\n" }, { "commit": "3b5d56b9317fa7b5407dff1aa7b115bf6cdbd494", "tree": "d733bab15dcf193c3364d14fc2d973aa20a28fe3", "parents": [ "eae3ee7d8a7c59cf63441dedf28674889f5fc477" ], "author": { "name": "Eric B Munson", "email": "emunson@mgebm.net", "time": "Sat Mar 10 14:37:26 2012 -0500" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Apr 08 12:48:59 2012 +0300" }, "message": "kvmclock: Add functions to check if the host has stopped the vm\n\nWhen a host stops or suspends a VM it will set a flag to show this. The\nwatchdog will use these functions to determine if a softlockup is real, or the\nresult of a suspended VM.\n\nSigned-off-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nasm-generic changes Acked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n\n" }, { "commit": "167d82152079debd0a76726972a76ea032d82043", "tree": "076a9d27a89e6540692bbcabc5b9f600cbbe1856", "parents": [ "f3718a818f7fb3636130d5f34bde8df34f45c5e5" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Apr 03 19:14:04 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:23:44 2012 -0700" }, "message": "avr32: fix nop compile fails from system.h split up\n\nTo fix:\n\n In file included from kernel/exit.c:61:\n arch/avr32/include/asm/mmu_context.h: In function \u0027enable_mmu\u0027:\n arch/avr32/include/asm/mmu_context.h:135: error: implicit declaration of function \u0027nop\u0027\n\nIt needs an include of the new file created in commit ae4739465866\n(\"Disintegrate asm/system.h for AVR32\"), but since that file only\ncontains \"nop\", and since other arch already have precedent of putting\nnop in asm/barrier.h we should just delete the new file and put nop in\nbarrier.h\n\nSuggested-and-acked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3d92e05118262379f76a220772b666dfddb77a9d", "tree": "a63a1e55edd9bfa3e9ff9e1f8e2d09fe12b11615", "parents": [ "b443caf12f9ee14e9843e53d4d929319e637275a" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Apr 01 16:38:40 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 14:41:25 2012 -0700" }, "message": "avr32: fix build failures from mis-naming of atmel_nand.h\n\nCommit bf4289cba02b (\"ATMEL: fix nand ecc support\") indicated that it\nwanted to \"Move platform data to a common header\ninclude/linux/platform_data/atmel_nand.h\" and the new header even had\nre-include protectors with:\n\n #ifndef __ATMEL_NAND_H__\n\nHowever, the file that was added was simply called atmel.h\nand this caused avr32 defconfig to fail with:\n\n In file included from arch/avr32/boards/atstk1000/setup.c:22:\n arch/avr32/mach-at32ap/include/mach/board.h:10:44: error: linux/platform_data/atmel_nand.h: No such file or directory\n In file included from arch/avr32/boards/atstk1000/setup.c:22:\n arch/avr32/mach-at32ap/include/mach/board.h:121: warning: \u0027struct atmel_nand_data\u0027 declared inside parameter list\n arch/avr32/mach-at32ap/include/mach/board.h:121: warning: its scope is only this definition or declaration, which is probably not what you want\n make[2]: *** [arch/avr32/boards/atstk1000/setup.o] Error 1\n\nIt seems the scope of the file contents will expand beyond\njust nand, so ignore the original intention, and fix up the\nusers who reference the bad name with the _nand suffix.\n\nCC: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCC: David Woodhouse \u003cdwmw2@infradead.org\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "923f79743c76583ed4684e2c80c8da51a7268af3", "tree": "e523a04c6b4cdddf70cf4adec25fa4fbbdbc5f5a", "parents": [ "a7697b945e6e5025f184d6762e7285f1c498411d", "7f3bd6c9cb8e9fa2b57bfa860cd3e734a28f48ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:15:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:15:43 2012 -0700" }, "message": "Merge branch \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\nPull kbuild changes from Michal Marek:\n - Unification of cmd_uimage among archs that use it\n - make headers_check tries harder before reporting a missing\n \u003clinux/types.h\u003e include\n - kbuild portability fix for shells that do not support echo -e\n - make clean descends into samples/\n - setlocalversion grep fix\n - modpost typo fix\n - dtc warnings fix\n\n* \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n setlocalversion: Use \"grep -q\" instead of piping output to \"read dummy\"\n modpost: fix ALL_INIT_DATA_SECTIONS\n Kbuild: centralize MKIMAGE and cmd_uimage definitions\n headers_check: recursively search for linux/types.h inclusion\n scripts/Kbuild.include: Fix portability problem of \"echo -e\"\n scripts: dtc: fix compile warnings\n kbuild: clean up samples directory\n kbuild: disable -Wmissing-field-initializers for W\u003d1\n" }, { "commit": "a591afc01d9e48affbacb365558a31e53c85af45", "tree": "9bb91f4eb94ec69fc4706c4944788ec5f3586063", "parents": [ "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "31796ac4e8f0e88f5c10f1ad6dab8f19bebe44a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "message": "Merge branch \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x32 support for x86-64 from Ingo Molnar:\n \"This tree introduces the X32 binary format and execution mode for x86:\n 32-bit data space binaries using 64-bit instructions and 64-bit kernel\n syscalls.\n\n This allows applications whose working set fits into a 32 bits address\n space to make use of 64-bit instructions while using a 32-bit address\n space with shorter pointers, more compressed data structures, etc.\"\n\nFix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}\n\n* \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)\n x32: Fix alignment fail in struct compat_siginfo\n x32: Fix stupid ia32/x32 inversion in the siginfo format\n x32: Add ptrace for x32\n x32: Switch to a 64-bit clock_t\n x32: Provide separate is_ia32_task() and is_x32_task() predicates\n x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls\n x86/x32: Fix the binutils auto-detect\n x32: Warn and disable rather than error if binutils too old\n x32: Only clear TIF_X32 flag once\n x32: Make sure TS_COMPAT is cleared for x32 tasks\n fs: Remove missed -\u003efds_bits from cessation use of fd_set structs internally\n fs: Fix close_on_exec pointer in alloc_fdtable\n x32: Drop non-__vdso weak symbols from the x32 VDSO\n x32: Fix coding style violations in the x32 VDSO code\n x32: Add x32 VDSO support\n x32: Allow x32 to be configured\n x32: If configured, add x32 system calls to system call tables\n x32: Handle process creation\n x32: Signal-related system calls\n x86: Add #ifdef CONFIG_COMPAT to \u003casm/sys_ia32.h\u003e\n ...\n" }, { "commit": "ef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5", "tree": "d0561d3ef89c9cd277a38168e33850666cbd33c4", "parents": [ "71db34fc4330f7c784397acb9f1e6ee7f7b32eb2", "5b2e02e401deb44e7f5befe19404d8b2688efea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 15:34:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 15:34:57 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine update from Vinod Koul:\n \"This includes the cookie cleanup by Russell, the addition of context\n parameter for dmaengine APIs, more arm dmaengine driver cleanup by\n moving code to dmaengine, this time for imx by Javier and pl330 by\n Boojin along with the usual driver fixes.\"\n\nFix up some fairly trivial conflicts with various other cleanups.\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)\n dmaengine: imx: fix the build failure on x86_64\n dmaengine: i.MX: Fix merge of cookie branch.\n dmaengine: i.MX: Add support for interleaved transfers.\n dmaengine: imx-dma: use \u0027dev_dbg\u0027 and \u0027dev_warn\u0027 for messages.\n dmaengine: imx-dma: remove \u0027imx_dmav1_baseaddr\u0027 and \u0027dma_clk\u0027.\n dmaengine: imx-dma: remove unused arg of imxdma_sg_next.\n dmaengine: imx-dma: remove internal structure.\n dmaengine: imx-dma: remove \u0027resbytes\u0027 field of \u0027internal\u0027 structure.\n dmaengine: imx-dma: remove \u0027in_use\u0027 field of \u0027internal\u0027 structure.\n dmaengine: imx-dma: remove sg member from internal structure.\n dmaengine: imx-dma: remove \u0027imxdma_setup_sg_hw\u0027 function.\n dmaengine: imx-dma: remove \u0027imxdma_config_channel_hw\u0027 function.\n dmaengine: imx-dma: remove \u0027imxdma_setup_mem2mem_hw\u0027 function.\n dmaengine: imx-dma: remove dma_mode member of internal structure.\n dmaengine: imx-dma: remove data member from internal structure.\n dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c\n dmaengine: at_hdmac: add slave config operation\n dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic\n dmaengine/dma_slave: introduce inline wrappers\n dma: imx-sdma: Treat firmware messages as warnings instead of erros\n ...\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "09893ee84591b0417a9186a7e7cf1503ccf99ac2", "tree": "da8b044ad157b82203df04ae48cb60f4737cc390", "parents": [ "4bb2d1009f671815870e8f78e826e4f9071392a7", "7d1206bc2859c6e9f46e35ae697c138e7d7858a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 12:34:33 2012 -0700" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: More device tree support updates\" from Olof Johansson:\n \"This branch contains a number of updates for device tree support on\n several ARM platforms, in particular:\n\n * AT91 continues the device tree conversion adding support for a\n number of on-chip drivers and other functionality\n * ux500 adds probing of some of the core SoC blocks through device\n tree\n * Initial device tree support for ST SPEAr600 platforms\n * kirkwood continues the conversion to device-tree probing\"\n\nManually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and\ndrivers/usb/gadget/at91_udc.c due to header file include cleanups.\n\nAlso do an \"evil merge\" for the MACH_U8500 config option rename that the\naffected RMI4 touchscreen driver in staging. It\u0027s called MACH_MOP500\nnow, and it was missed during previous merges.\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n ARM: SPEAr600: Add device-tree support to SPEAr600 boards\n ARM: ux500: Provide local timer support for Device Tree\n ARM: ux500: Enable PL022 SSP Controller in Device Tree\n ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree\n ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree\n ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree\n ARM: ux500: db8500: list most devices in the snowball device tree\n ARM: ux500: split dts file for snowball into generic part\n ARM: ux500: combine the board init functions for DT boot\n ARM: ux500: Initial Device Tree support for Snowball\n ARM: ux500: CONFIG: Enable Device Tree support for future endeavours\n ARM: kirkwood: use devicetree for rtc-mv\n ARM: kirkwood: rtc-mv devicetree bindings\n ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0\n ARM: kirkwood: fdt: facilitate new boards during fdt migration\n ARM: kirkwood: fdt: absorb kirkwood_init()\n ARM: kirkwood: fdt: use mrvl ticker symbol\n ARM: orion: wdt: use resource vice direct access\n ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.\n ARM: orion: spi: remove enable_clock_fix which is not used\n ...\n" }, { "commit": "141124c02059eee9dbc5c86ea797b1ca888e77f7", "tree": "ee5feb86df07f0f0de1350dd569767ec31537869", "parents": [ "9ffc93f203c18a70623f21950f1dd473c9ec48cd" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Delete all instances of asm/system.h\n\nDelete all instances of asm/system.h as they should be redundant by this\npoint.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "ae473946586680b01c13975a3b674de23ad7c93e", "tree": "e128417aff2d3865876af81ef95a54605031562b", "parents": [ "9f97da78bf018206fb623cd351d454af2f105fe0" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:01 2012 +0100" }, "message": "Disintegrate asm/system.h for AVR32\n\nDisintegrate asm/system.h for AVR32. This has not been compiled at all.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\n" }, { "commit": "66f03c614c0902ccf7d6160459362a9352f33271", "tree": "b9a8864efe5aa7fc5c96cc5ccbeca41f5cd6f6a7", "parents": [ "34800598b2eebe061445216473b1e4c2ff5cba99", "cdc3df6f44f72c5924a16a47e1663c3fb0e57820" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:47:35 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: device tree work\" from Arnd Bergmann:\n \"Most of these patches convert code from using static platform data to\n describing the hardware in the device tree. This is only the first\n half of the changes for v3.4 because a lot of patches for this topic\n came in the last week before the merge window.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFix up trivial conflicts in arch/arm/mach-vexpress/{Kconfig,core.h}\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (86 commits)\n Document: devicetree: add OF documents for arch-mmp\n ARM: dts: append DTS file of pxa168\n ARM: mmp: append OF support on pxa168\n ARM: mmp: enable rtc clk in pxa168\n i2c: pxa: add OF support\n serial: pxa: add OF support\n arm/dts: mt_ventoux: very basic support for TeeJet Mt.Ventoux board\n ARM: OMAP2+: Remove extra ifdefs for board-generic\n ARM: OMAP2+: Fix build error when only ARCH_OMAP2/3 or 4 is selected\n ASoC: DT: Add digital microphone binding to PAZ00 board.\n ARM: dt: Add ARM PMU to tegra*.dtsi\n ARM: at91: at91sam9x5cm/dt: add leds support\n ARM: at91: usb_a9g20/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add gpio-keys support\n ARM: at91: at91sam9m10g45ek/dt: add leds support\n ARM: at91: usb_a9g20/dt: add leds support\n ARM: at91/pio: add new PIO3 features\n ARM: at91: add sam9_smc.o to at91sam9x5 build\n ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter\n ARM: at91/tc: add device tree support to atmel_tclib\n ...\n" }, { "commit": "d61b7a572b292e2be409e13b4b3adf475f18fb29", "tree": "e9d30390860147136c05e66abf1edda1bc5b0562", "parents": [ "18d9946bc7e2252fe3c0f2f609ac383c627edefd", "f4e2467bad53023589cbff18dd1ab6e0aa3f004c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 16:03:32 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull \"ARM: global cleanups\" from Arnd Bergmann:\n \"Quite a bit of code gets removed, and some stuff moved around, mostly\n the old samsung s3c24xx stuff. There should be no functional changes\n in this series otherwise. Some cleanups have dependencies on other\n arm-soc branches and will be sent in the second round.\n\n Signed-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\"\n\nFixed up trivial conflicts mainly due to #include\u0027s being changes on\nboth sides.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)\n ep93xx: Remove unnecessary includes of ep93xx-regs.h\n ep93xx: Move EP93XX_SYSCON defines to SoC private header\n ep93xx: Move crunch code to mach-ep93xx directory\n ep93xx: Make syscon access functions private to SoC\n ep93xx: Configure GPIO ports in core code\n ep93xx: Move peripheral defines to local SoC header\n ep93xx: Convert the watchdog driver into a platform device.\n ep93xx: Use ioremap for backlight driver\n ep93xx: Move GPIO defines to gpio-ep93xx.h\n ep93xx: Don\u0027t use system controller defines in audio drivers\n ep93xx: Move PHYS_BASE defines to local SoC header file\n ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver\n ARM: EXYNOS: add clock registers for exynos4x12-cpufreq\n PM / devfreq: update the name of EXYNOS clock registers that were omitted\n PM / devfreq: update the name of EXYNOS clock register\n ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock\n ARM: EXYNOS: use static declaration on regarding clock\n ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs\n ARM: OMAP2+: Fix build error after merge\n ARM: S3C24XX: remove call to s3c24xx_setup_clocks\n ...\n" }, { "commit": "e33936451484b06b61b259172fa3761a7d1cd4dc", "tree": "acdbb021fc7f3ba4c13adbd70059f7a7c70c9803", "parents": [ "f75a8df3bd6466e29a4e40b86b2cfc96fe06d328" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Fri Mar 16 15:03:55 2012 -0600" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Mar 26 15:49:20 2012 +0200" }, "message": "Kbuild: centralize MKIMAGE and cmd_uimage definitions\n\nAll ARCHs have the same definition of MKIMAGE. Move it to Makefile.lib\nto avoid duplication.\n\nAll ARCHs have similar definitions of cmd_uimage. Place a sufficiently\nparameterized version in Makefile.lib to avoid duplication.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nTested-by: Mike Frysinger \u003cvapier@gentoo.org\u003e [Blackfin]\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e [Microblaze]\nTested-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e [unicore32]\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "ed2d265d1266736bd294332d7f649003943ae36e", "tree": "860e5b7bb72933e4a9abacdc2f2d75a0e6254e32", "parents": [ "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "6c03438edeb5c359af35f060ea016ca65671c269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "message": "Merge tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/bug.h\u003e cleanup from Paul Gortmaker:\n \"The changes shown here are to unify linux\u0027s BUG support under the one\n \u003clinux/bug.h\u003e file. Due to historical reasons, we have some BUG code\n in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in\n linux/kernel.h predates the addition of linux/bug.h, but old code in\n kernel.h wasn\u0027t moved to bug.h at that time. As a band-aid, kernel.h\n was including \u003casm/bug.h\u003e to pseudo link them.\n\n This has caused confusion[1] and general yuck/WTF[2] reactions. Here\n is an example that violates the principle of least surprise:\n\n CC lib/string.o\n lib/string.c: In function \u0027strlcat\u0027:\n lib/string.c:225:2: error: implicit declaration of function \u0027BUILD_BUG_ON\u0027\n make[2]: *** [lib/string.o] Error 1\n $\n $ grep linux/bug.h lib/string.c\n #include \u003clinux/bug.h\u003e\n $\n\n We\u0027ve included \u003clinux/bug.h\u003e for the BUG infrastructure and yet we\n still get a compile fail! [We\u0027ve not kernel.h for BUILD_BUG_ON.] Ugh -\n very confusing for someone who is new to kernel development.\n\n With the above in mind, the goals of this changeset are:\n\n 1) find and fix any include/*.h files that were relying on the\n implicit presence of BUG code.\n 2) find and fix any C files that were consuming kernel.h and hence\n relying on implicitly getting some/all BUG code.\n 3) Move the BUG related code living in kernel.h to \u003clinux/bug.h\u003e\n 4) remove the asm/bug.h from kernel.h to finally break the chain.\n\n During development, the order was more like 3-4, build-test, 1-2. But\n to ensure that git history for bisect doesn\u0027t get needless build\n failures introduced, the commits have been reorderd to fix the problem\n areas in advance.\n\n\t[1] https://lkml.org/lkml/2012/1/3/90\n\t[2] https://lkml.org/lkml/2012/1/17/414\"\n\nFix up conflicts (new radeon file, reiserfs header cleanups) as per Paul\nand linux-next.\n\n* tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n kernel.h: doesn\u0027t explicitly use bug.h, so don\u0027t include it.\n bug: consolidate BUILD_BUG_ON with other bug code\n BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n bug.h: add include of it to various implicit C users\n lib: fix implicit users of kernel.h for TAINT_WARN\n spinlock: macroize assert_spin_locked to avoid bug.h dependency\n x86: relocate get/set debugreg fcns to include/asm/debugreg.\n" }, { "commit": "3b59bf081622b6446db77ad06c93fe23677bc533", "tree": "3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb", "parents": [ "e45836fafe157df137a837093037f741ad8f4c90", "bbdb32cb5b73597386913d052165423b9d736145" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking merge from David Miller:\n \"1) Move ixgbe driver over to purely page based buffering on receive.\n From Alexander Duyck.\n\n 2) Add receive packet steering support to e1000e, from Bruce Allan.\n\n 3) Convert TCP MD5 support over to RCU, from Eric Dumazet.\n\n 4) Reduce cpu usage in handling out-of-order TCP packets on modern\n systems, also from Eric Dumazet.\n\n 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine\n folks happy, from Erich Hoover.\n\n 6) Support VLAN trunking from guests in hyperv driver, from Haiyang\n Zhang.\n\n 7) Support byte-queue-limtis in r8169, from Igor Maravic.\n\n 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but\n was never properly implemented, Jiri Benc fixed that.\n\n 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.\n\n 10) Support kernel side dump filtering by ctmark in netfilter\n ctnetlink, from Pablo Neira Ayuso.\n\n 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.\n\n 12) Add new peek socket options to assist with socket migration, from\n Pavel Emelyanov.\n\n 13) Add sch_plug packet scheduler whose queue is controlled by\n userland daemons using explicit freeze and release commands. From\n Shriram Rajagopalan.\n\n 14) Fix FCOE checksum offload handling on transmit, from Yi Zou.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)\n Fix pppol2tp getsockname()\n Remove printk from rds_sendmsg\n ipv6: fix incorrent ipv6 ipsec packet fragment\n cpsw: Hook up default ndo_change_mtu.\n net: qmi_wwan: fix build error due to cdc-wdm dependecy\n netdev: driver: ethernet: Add TI CPSW driver\n netdev: driver: ethernet: add cpsw address lookup engine support\n phy: add am79c874 PHY support\n mlx4_core: fix race on comm channel\n bonding: send igmp report for its master\n fs_enet: Add MPC5125 FEC support and PHY interface selection\n net: bpf_jit: fix BPF_S_LDX_B_MSH compilation\n net: update the usage of CHECKSUM_UNNECESSARY\n fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx\n net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso\n ixgbe: Fix issues with SR-IOV loopback when flow control is disabled\n net/hyperv: Fix the code handling tx busy\n ixgbe: fix namespace issues when FCoE/DCB is not enabled\n rtlwifi: Remove unused ETH_ADDR_LEN defines\n igbvf: Use ETH_ALEN\n ...\n\nFix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and\ndrivers/net/usb/{Kconfig,qmi_wwan.c} as per David.\n" }, { "commit": "bf4289cba02b8cf770ecd7959ca70839f0dd9d3c", "tree": "12c94db33209130c12ce7c31cb2d7f36b303b651", "parents": [ "f75622f4679479d352d2fa83e0d84c6c13cfcb5f" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Thu Dec 29 14:43:24 2011 +0800" }, "committer": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Thu Mar 15 23:26:32 2012 +0800" }, "message": "ATMEL: fix nand ecc support\n\nSo we can now choose for the board the ecc mode (ecc soft, soft bch, no ecc\nand hardware).\n\nSet ecc mode in the boards to soft as currently in the driver.\n\nMove platform data to a common header\ninclude/linux/platform_data/atmel_nand.h\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nAcked-by: David Woodhouse \u003cdwmw2@infradead.org\u003e\n" }, { "commit": "187f1882b5b0748b3c4c22274663fdb372ac0452", "tree": "36283f258cf65f03599a045d48bb05d0ec27f3f9", "parents": [ "50af5ead3b44ccf8bd2b4d2a50c1b610f557c480" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Nov 23 20:12:59 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Mar 04 17:54:34 2012 -0500" }, "message": "BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n\nIf a header file is making use of BUG, BUG_ON, BUILD_BUG_ON, or any\nother BUG variant in a static inline (i.e. not in a #define) then\nthat header really should be including \u003clinux/bug.h\u003e and not just\nexpecting it to be implicitly present.\n\nWe can make this change risk-free, since if the files using these\nheaders didn\u0027t have exposure to linux/bug.h already, they would have\nbeen causing compile failures/warnings.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "bd2f55361f18347e890d52ff9cfd8895455ec11b", "tree": "5725e83f96934da2c2d741255db929df34f153eb", "parents": [ "c5491ea779793f977d282754db478157cc409d82" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Mar 21 12:33:18 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 01 10:28:03 2012 +0100" }, "message": "sched/rt: Use schedule_preempt_disabled()\n\nCoccinelle based conversion.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/n/tip-24swm5zut3h9c4a6s46x8rws@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7eca30aef7961e68ad74c0ef920546c2be7f6579", "tree": "d7161459a86134bee58b8a0980a15b66839467aa", "parents": [ "d65b4e98d7ea3038b767b70fe8be959b2913f16d", "d5e5a7f987458f42f24a557a0f4e35f94c43fc09" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 17:22:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Feb 29 12:03:08 2012 +0000" }, "message": "Merge branch \u0027at91-3.4-base2+cleanup\u0027 of git://github.com/at91linux/linux-at91 into at91/staging/base2+cleanup\n\n* \u0027at91-3.4-base2+cleanup\u0027 of git://github.com/at91linux/linux-at91: (20 commits)\n ARM: at91: properly sort dtb files in Makefile.boot\n ARM: at91: add at91sam9g25ek.dts in Makefile.boot\n ARM: at91/board-dt: drop default console\n Atmel: move console default platform_device to serial driver\n ARM: at91: merge SRAM Memory banks thanks to mirroring\n ARM: at91: finally drop at91_sys_read/write\n ARM: at91/rtc-at91sam9: pass the GPBR to use via resources\n ARM: at91:rtc/rtc-at91sam9: ioremap register bank\n ARM: at91/rtc-at91sam9: each SoC can select the RTT device to use\n ARM: at91/PMC: make register base soc independent\n ARM: at91/PMC: move assignment out of printf\n ARM: at91/pm_slowclock: add runtime detection of memory contoller\n ARM: at91: make sdram/ddr register base soc independent\n ARM: at91: move at91rm9200 sdramc defines to at91rm9200_sdramc.h\n ARM: at91/pm_slowclock: function slow_clock() accepts parameters\n ARM: at91/pm_slowclock: rename register to named define\n ARM: at91/ST: remove not needed casts\n ARM: at91: make ST (System Timer) soc independent\n ARM: at91: make matrix register base soc independent\n ARM: at91/at91x40: remove use of at91_sys_read/write\n\nBased on top of the at91/9x5, rmk/for-armsoc, at91/device-board,\nat91/pm_cleanup and at91/base.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "96a3eab338c01e172745b1686c51c1be96ce9ead", "tree": "5a53947a192549d9edf63550258e1bddf6f1d794", "parents": [ "b01ee53dda8bd81855b7cda0dfb7f27d1524d87f", "a5a928c51f807262a13e6e3412e0e1324f6b7aeb" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 13:40:41 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Feb 27 13:40:49 2012 +0000" }, "message": "Merge branch \u0027imx-cleanup\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup\n\n* \u0027imx-cleanup\u0027 of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits)\n ARM: Remove redundant \u0027;\u0027 from avic_irq_set_priority()\n ARM: mx3: Let mx31 and mx35 share the same CCM header file\n ARM: plat-mxc: audmux-v1: Remove unneeded ifdef\u0027s\n\nUpdate to v3.3-rc3\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "3bdc0eba0b8b47797f4a76e377dd8360f317450f", "tree": "da6bd907f599402bc8db0a2484997fd4d3e06f7b", "parents": [ "0184039a4b6727d6efd545919c773ef141090ae7" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Sat Feb 11 15:39:30 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Feb 24 01:37:35 2012 -0800" }, "message": "net: Add framework to allow sending packets with customized CRC.\n\nThis is useful for testing RX handling of frames with bad\nCRCs.\n\nRequires driver support to actually put the packet on the\nwire properly.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "69f6a27bf4c86e986964100e560d991a8de03833", "tree": "6957eefc1acb13a3a793058eaf886fe47403fafd", "parents": [ "c9b1e3ffbc322a1d1e1272062a9361abe536a33a" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Thu Feb 16 00:24:07 2012 +0800" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Thu Feb 23 14:57:59 2012 +0100" }, "message": "Atmel: move console default platform_device to serial driver\n\nThis variable spread on every SoC that is using the atmel_serial.c\ndriver can be included directly into the latter.\n\nThis will allow to compile multiple soc in the same kernel.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: kernel@avr32linux.org\n" }, { "commit": "e2b35f3dbfc080f15b72834d08f04f0269dbe9be", "tree": "fda60f8be147b57cf01155528dda33a9a99b0dab", "parents": [ "327e6970258618da810f72e86cf2a8b803927e14" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:27 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:39 2012 +0530" }, "message": "dmaengine/dw_dmac: Fix dw_dmac user drivers to adapt to slave_config changes\n\nThere are few existing user drivers of dw_dmac. They will break as soon as we\nremove unused fields from struct dw_dma_slave. This patch focuses to fix these\nuser drivers to use dma_slave_config() routine.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "ef64a54f6e558155b4f149bb10666b9e914b6c54", "tree": "bd7adba8d802aff2aaec0f5f2a9e2ba5431cafcc", "parents": [ "da5ef6e51b327b41180b5d1000c06e8d3595a936" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Feb 21 07:31:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 21 15:03:48 2012 -0500" }, "message": "sock: Introduce the SO_PEEK_OFF sock option\n\nThis one specifies where to start MSG_PEEK-ing queue data from. When\nset to negative value means that MSG_PEEK works as ususally -- peeks\nfrom the head of the queue always.\n\nWhen some bytes are peeked from queue and the peeking offset is non\nnegative it is moved forward so that the next peek will return next\nportion of data.\n\nWhen non-peeking recvmsg occurs and the peeking offset is non negative\nis is moved backward so that the next peek will still peek the proper\ndata (i.e. the one that would have been picked if there were no non\npeeking recv in between).\n\nThe offset is set using per-proto opteration to let the protocol handle\nthe locking issues and to check whether the peeking offset feature is\nsupported by the protocol the socket belongs to.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0967504816cfe478c5b24c07216573c6cd584184", "tree": "94e1a65b466a274513a8501283e4ecf03dcf23c7", "parents": [ "e7ca2e1d9bea753dca96e3c693f0608035ea20ed" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Feb 07 21:08:49 2012 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Feb 14 12:01:28 2012 -0800" }, "message": "avr32: Use generic posix_types.h\n\nChange the avr32 architecture to use \u003casm-generic/posix_types.h\u003e.\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nLink: http://lkml.kernel.org/r/1328677745-20121-6-git-send-email-hpa@zytor.com\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\n" }, { "commit": "31e0017e6f6fb5cfdfaf932c1f98c9bef8d57688", "tree": "95c057390ec5466082ad295a991f585174d0e3d3", "parents": [ "35512ecaef03250fe50ad81430dd467f01d9a96b" ], "author": { "name": "Fabio Baltieri", "email": "fabio.baltieri@gmail.com", "time": "Fri Feb 03 15:37:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 03 16:16:40 2012 -0800" }, "message": "avr32: select generic atomic64_t support\n\nEnable use of the generic atomic64 implementation on AVR32 platforms.\nWithout this the kernel fails to build as the architecture does not\nprovide its version.\n\nSigned-off-by: Fabio Baltieri \u003cfabio.baltieri@gmail.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9918ceafd4a9e013572e03983f528017c29bb1cb", "tree": "90d7885b26b87d27ed4cdb4026e608908e8a8a4c", "parents": [ "57225b76864210d667b935c54babf22b6c31336b" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Thu Jan 26 14:07:09 2012 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Fri Feb 03 13:33:05 2012 +0100" }, "message": "ARM: at91: code removal of CAP9 SoC\n\nFollowing removal announce and addition to feature-removal-schedule.txt,\nhere is the actual source code deletion for Atmel CAP9 family.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "9402c95f34a66e81eba473a2f7267bbae5a1dee2", "tree": "c46628e702d625a737fedbd9de88138a94c93d1f", "parents": [ "80bf007f20b16272f210e0803f739f5606cff59d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jan 12 17:17:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:03 2012 -0800" }, "message": "treewide: remove useless NORET_TYPE macro and uses\n\nIt\u0027s a very old and now unused prototype marking so just delete it.\n\nNeaten panic pointer argument style to keep checkpatch quiet.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\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\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\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: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "acc952c1f373bf3f66cc7a10680eee1762bed40b", "tree": "de1135ffe304f4d8e53d282e5bb1bde5db04e0ae", "parents": [ "57e964e1ae9bd4f699ae1074430bcf81a9a11377", "40ba95fdf158713377d47736b1b3a9d75f4f2515" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:21:03 2012 -0800" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nCleanups on various subarchitectures\n\nCleanup patches for various ARM platforms and some of their associated\ndrivers, the bulk of these is for mach-91.\n\nArnd ended up pulling in the restart branch from Russell in order to\nfix up some simple but annoying merge conflicts.\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)\n arm/at91: fix build of stamp9g20\n ARM: u300: delete memory.h\n MAINTAINERS: add maintainer entry for Picochip picoxcell\n ARM: picoxcell: move io mappings to common.c\n ARM: picoxcell: don\u0027t reserve irq_descs\n ARM: picoxcell: remove mach/memory.h\n ARM: at91: delete the pcontrol_g20_defconfig\n arm/tegra: Remove code that\u0027s ifndef CONFIG_ARM_GIC\n arm/tegra: remove unused defines\n arm/tegra: fix variable formatting in makefile\n ARM: davinci: vpif: move code to driver core header from platform\n ARM: at91/gpio: fix display of number of irq setuped\n ARM: at91/gpio: drop PIN_BASE\n ARM: at91/udc: use gpio_is_valid to check the gpio\n ARM: at91/ohci: use gpio_is_valid to check the gpio\n ARM: at91/nand: use gpio_is_valid to check the gpio\n ARM: at91/mmc: use gpio_is_valid to check the gpio\n ARM: at91/ide: use gpio_is_valid to check the gpio\n ARM: at91/pata: use gpio_is_valid to check the gpio\n ARM: at91/soc: use gpio_is_valid to check the gpio\n ...\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": "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": "84dfa9897ef913771af44484fefbe0de29fdce51", "tree": "83bd6cdaa765a0517586edc8e67458000b20b4f1", "parents": [ "93d3a10ef4fdfd4b6d1a3f09b645cd08f74a8115" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 27 14:54:36 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:18 2012 -0500" }, "message": "consolidate a bunch of ipcbuf.h instances\n\n... some still remain weird :-/\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0583fcc96bb117763c0fa74c123573c0112dec65", "tree": "5d8a62e922c34e6e6bc0836b40f5b59f69266766", "parents": [ "1bc94226d5c642b78cf6b2e3e843ef24eb740df0" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 17:04:15 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:17 2012 -0500" }, "message": "consolidate umode_t declarations\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "edbaa603eb801655e80808a9cf3d3b622e8ac66b", "tree": "a0a0091fc1d17fea32d6d21e3ce13d228fba6325", "parents": [ "7239f65cf364180cdb100a4ed211b2a9f9a72119" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 16:26:03 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 16:26:03 2011 -0800" }, "message": "driver-core: remove sysdev.h usage.\n\nThe sysdev.h file should not be needed by any in-kernel code, so remove\nthe .h file from these random files that seem to still want to include\nit.\n\nThe sysdev code will be going away soon, so this include needs to be\nremoved no matter what.\n\nCc: Jiandong Zheng \u003cjdzheng@broadcom.com\u003e\nCc: Scott Branden \u003csbranden@broadcom.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nCc: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: \"Venkatesh Pallipadi\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\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": "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": "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": "84e0cdb0a262483a3618091c43dae33d36226430", "tree": "63d3213354567d1e407db2a4adbc26842deadb68", "parents": [ "461845db2176d2e11b45f1f24cbd0ed8ddf26fcb" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Tue Mar 08 20:17:06 2011 +0000" }, "committer": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Tue Nov 22 15:21:16 2011 +0000" }, "message": "macb: unify at91 and avr32 platform data\n\nBoth at91 and avr32 defines its own platform data structure for\nthe macb driver and both share common structures though at91\nincludes a currently unused phy_irq_pin. Create a common\nmacb_platform_data for macb that both at91 and avr32 can use. In\nfuture we can use this to support other architectures that use the\nsame IP block with the macb driver.\n\nv2: rename eth_platform_data to macb_platform_data and allow at91_ether\nto share the platform data with macb.\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nTested-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\n" }, { "commit": "d88e4cb67197d007fb778d62fe17360e970d5bfa", "tree": "5307877c29d7d9f8be6699164039db26e50be457", "parents": [ "a3201227f803ad7fd43180c5195dbe5a2bf998aa" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "message": "freezer: remove now unused TIF_FREEZE\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: linux-arch@vger.kernel.org\n" }, { "commit": "e11c259f745889b55bc5596ca78271f2f5cf08d2", "tree": "5025f0bf9093e84d0643beb9097249c176dbbea7", "parents": [ "8d26784cf0d04c1238e906efdd5de76439cb0a1e", "b4487c2d0edaf1332d7a9f11b5661044955ef5e2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tinclude/net/bluetooth/bluetooth.h\n" }, { "commit": "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": "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "tree": "7320a130dc304623f5cf4b5dd8f67fb1776225ca", "parents": [ "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "48e546b7f281f251893baa40769581fd15f085fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (226 commits)\n mtd: tests: annotate as DANGEROUS in Kconfig\n mtd: tests: don\u0027t use mtd0 as a default\n mtd: clean up usage of MTD_DOCPROBE_ADDRESS\n jffs2: add compr\u003dlzo and compr\u003dzlib options\n jffs2: implement mount option parsing and compression overriding\n mtd: nand: initialize ops.mode\n mtd: provide an alias for the redboot module name\n mtd: m25p80: don\u0027t probe device which has status of \u0027disabled\u0027\n mtd: nand_h1900 never worked\n mtd: Add DiskOnChip G3 support\n mtd: m25p80: add EON flash EN25Q32B into spi flash id table\n mtd: mark block device queue as non-rotational\n mtd: r852: make r852_pm_ops static\n mtd: m25p80: add support for at25df321a spi data flash\n mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks\n mtd: nand: switch `check_pattern()\u0027 to standard `memcmp()\u0027\n mtd: nand: invalidate cache on unaligned reads\n mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set\n mtd: nand: wait to set BBT version\n mtd: nand: scrub BBT on ECC errors\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-at91/board-usb-a9260.c\n\tMerged into board-usb-a926x.c\n - drivers/mtd/maps/lantiq-flash.c\n\tadd_mtd_partitions -\u003e mtd_device_register vs changed to use\n\tmtd_device_parse_register.\n" }, { "commit": "09cf6a299c5eb022249a75d2124d2bbbe440684c", "tree": "504d12ff626ac050b1538ee3e64126a3f533835a", "parents": [ "12799fe45254b66975481da826fc510685e206eb" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Aug 01 12:55:26 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:59 2011 -0400" }, "message": "avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE\n\nAdd it in where the module.h implicit presence was doing\nthe job before.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "1754aab9bb869c173aa03b57587256827250e488", "tree": "fafa68ef3f589204534a5fb89d45dfa19addadfd", "parents": [ "9eeff8243677b8bbfc17e8e606e965bb591a759d" ], "author": { "name": "Dmitry Eremin-Solenikov", "email": "dbaryshkov@gmail.com", "time": "Sun May 29 17:49:22 2011 +0400" }, "committer": { "name": "Artem Bityutskiy", "email": "artem.bityutskiy@intel.com", "time": "Sun Sep 11 15:01:57 2011 +0300" }, "message": "mtd: ATMEL, AVR32: inline nand partition table access\n\nCurrently atmel_nand driver used by AT91 and AVR32 calls a special callback\nwhich return nand partition table and number of partitions. However in all\nboards this callback returns just static data. So drop this callback and\nmake atmel_nand use partition table provided statically via platform_data.\n\nNicolas Ferre: I am in favor for a mainline inclusion through linux-mtd tree.\nHans-Christian Egtvedt: I\u0027m fine by sending the changes for AVR32 through linux-mtd\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\n" }, { "commit": "f5b940997397229975ea073679b03967932a541b", "tree": "a477f440175d67b67928d6d11c845fe98f09eb72", "parents": [ "b727d20269e8ef1de002bfea8099f5e9db9e9f23" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Fri Aug 26 18:03:11 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 26 15:09:58 2011 -0700" }, "message": "All Arch: remove linkage for sys_nfsservctl system call\n\nThe nfsservctl system call is now gone, so we should remove all\nlinkage for it.\n\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d0e323b47057f4492b8fa22345f38d80a469bf8d", "tree": "feb760c7e2cdb1e43640417409428ab858910ea3", "parents": [ "c027a474a68065391c8773f6e83ed5412657e369", "c3e6088e1036f8084bc7444b38437da136b7588b" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:30:42 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:30:42 2011 -0400" }, "message": "Merge branch \u0027apei\u0027 into apei-release\n\nSome trivial conflicts due to other various merges\nadding to the end of common lists sooner than this one.\n\n\tarch/ia64/Kconfig\n\tarch/powerpc/Kconfig\n\tarch/x86/Kconfig\n\tlib/Kconfig\n\tlib/Makefile\n\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "df013ffb8119c89f062ab05b7f544704315db47b", "tree": "db87f30545d2fd6cf9b0a547f09d924df3be90dd", "parents": [ "9fb0bfe1408d5506b7b83d13d1eed573fd71d67d" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Wed Jul 13 13:14:22 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Aug 03 11:12:37 2011 -0400" }, "message": "Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG\n\ncmpxchg() is widely used by lockless code, including NMI-safe lockless\ncode. But on some architectures, the cmpxchg() implementation is not\nNMI-safe, on these architectures the lockless code may need a\nspin_trylock_irqsave() based implementation.\n\nThis patch adds a Kconfig option: ARCH_HAVE_NMI_SAFE_CMPXCHG, so that\nNMI-safe lockless code can depend on it or provide different\nimplementation according to it.\n\nOn many architectures, cmpxchg is only NMI-safe for several specific\noperand sizes. So, ARCH_HAVE_NMI_SAFE_CMPXCHG define in this patch\nonly guarantees cmpxchg is NMI-safe for sizeof(unsigned long).\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nAcked-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nAcked-by: Richard Henderson \u003crth@twiddle.net\u003e\nCC: Mikael Starvik \u003cstarvik@axis.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCC: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCC: Tony Luck \u003ctony.luck@intel.com\u003e\nCC: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCC: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCC: Michal Simek \u003cmonstr@monstr.eu\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCC: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCC: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCC: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Ingo Molnar \u003cmingo@redhat.com\u003e\nCC: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "7847777a45f9f8bfc8617dbf107bde1ecb59caee", "tree": "f9e31828db79e607a763f1eaea2119b2f270dcdb", "parents": [ "f24219b4e90cf70ec4a211b17fbabc725a0ddf3c" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: cleanup asm-generic atomic*.h inclusion\n\nAfter changing all consumers of atomics to include \u003clinux/atomic.h\u003e, we\nran into some compile time errors due to this dependency chain:\n\nlinux/atomic.h\n -\u003e asm/atomic.h\n -\u003e asm-generic/atomic-long.h\n\nwhere atomic-long.h could use funcs defined later in linux/atomic.h\nwithout a prototype. This patches moves the code that includes\nasm-generic/atomic*.h to linux/atomic.h.\n\nArchs that need \u003casm-generic/atomic64.h\u003e need to select\nCONFIG_GENERIC_ATOMIC64 from now on (some of them used to include it\nunconditionally).\n\nCompile tested on i386 and x86_64 with allnoconfig.\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f24219b4e90cf70ec4a211b17fbabc725a0ddf3c", "tree": "c1c753bd425d61a5094995d9835b23b46383d9b2", "parents": [ "60063497a95e716c9a689af3be2687d261f115b4" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: move atomic_add_unless to generic code\n\nThis is in preparation for more generic atomic primitives based on\n__atomic_add_unless.\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0e9a6cb5e66f4b23e2a8f6b3f00949b7b3125dda", "tree": "f5ae8bd305b7df5f9dcb75ea86b05174c3dc5b90", "parents": [ "778d3b0ff0654ad7092bf823fd32010066b12365" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Tue Jul 26 16:08:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:43 2011 -0700" }, "message": "ptrace: unify show_regs() prototype\n\n[ poleg@redhat.com: no need to declare show_regs() in ptrace.h, sched.h does this ]\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "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: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "ff0c4ad2c3a75ccfe6adca916e50804eb45bb2d9", "tree": "574f2d38793f7a08af73c40a96d6dc76af9c6f46", "parents": [ "fcda12e7f6d58d61997681a9d41779e3fd2ffc94", "19f9d392365113f74286b1721c7c032c12cf5abd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 24 09:55:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 24 09:55:18 2011 -0700" }, "message": "Merge branch \u0027for-upstream\u0027 of git://openrisc.net/jonas/linux\n\n* \u0027for-upstream\u0027 of git://openrisc.net/jonas/linux: (24 commits)\n OpenRISC: Add MAINTAINERS entry\n OpenRISC: Miscellaneous\n OpenRISC: Library routines\n OpenRISC: Headers\n OpenRISC: Traps\n OpenRISC: Module support\n OpenRISC: GPIO\n OpenRISC: Scheduling/Process management\n OpenRISC: Idle/Power management\n OpenRISC: System calls\n OpenRISC: IRQ\n OpenRISC: Timekeeping\n OpenRISC: DMA\n OpenRISC: PTrace\n OpenRISC: Build infrastructure\n OpenRISC: Signal handling\n OpenRISC: Memory management\n OpenRISC: Device tree\n OpenRISC: Boot code\n iomap: make IOPORT/PCI mapping functions conditional\n ...\n" }, { "commit": "66574cc05438dd0907029075d7e6ec5ac0036fbc", "tree": "8516792e486a535840e09b67f0831c303df3d45d", "parents": [ "74e08fcf7bef973512a1f813700f802a93678670" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Thu Jun 30 21:22:12 2011 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Sun Jul 24 22:06:04 2011 +0930" }, "message": "modules: make arch\u0027s use default loader hooks\n\nThis patch removes all the module loader hook implementations in the\narchitecture specific code where the functionality is the same as that\nnow provided by the recently added default hooks.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a4e05276a10198a1540dd1a0001f759c10ce1cf1", "tree": "54de020ff5efe46b2a0129e1fb42c922599ae958", "parents": [ "a87e553fabe8ceadc6f90889066559234cf194c7" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Sat Jul 02 11:40:18 2011 +0200" }, "committer": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jul 22 18:46:24 2011 +0200" }, "message": "asm-generic: move archictures to common delay.h\n\nThis patch moves the in-tree architectures that were using the \u0027generic\u0027\ndelay.h over to using the header file in asm-generic.\n\nThis is not done using the generic-y mechanism as none of these arch\u0027s\nhave started using that mechanism yet. This is a trivial change to make\nlater when the arch begins using generic-y.\n\nNote the subtle change to the avr32 and SH architectures where the argument\nto __const_udelay was previously using the rounded down constant value\ninstead of the rounded up value.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\n" }, { "commit": "b7e9c223be8ce335e30f2cf6ba588e6a4092275c", "tree": "2d1e3b75606abc18df7ad65e51ac3f90cd68b38d", "parents": [ "c172d82500a6cf3c32d1e650722a1055d72ce858", "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:48 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jul 11 14:15:55 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nSync with Linus\u0027 tree to be able to apply pending patches that\nare based on newer code already present upstream.\n" }, { "commit": "c7cbb02222eccb82bfd42696b01abceddae663f2", "tree": "6204f5c691c762ccddaa10a3928316d7a803dc3b", "parents": [ "fb139dfeef9558a12ffdbf9e26951fd1a9304f3b" ], "author": { "name": "Wanlong Gao", "email": "wanlong.gao@gmail.com", "time": "Wed Jun 15 15:08:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 15 20:04:02 2011 -0700" }, "message": "rtc: fix build warnings in defconfigs\n\nRTC_CLASS is changed to bool, so \u0027m\u0027 is invalid.\n\nSigned-off-by: Wanlong Gao \u003cwanlong.gao@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ff71db2f0784cfff38fa7b55908867a24ccc3216", "tree": "25c9e3bc7f95b83140665736c62319ebe25fdd93", "parents": [ "c162755491f7ca9853cb9f2aaa3ff3677c1bda78" ], "author": { "name": "Mathias Krause", "email": "minipli@googlemail.com", "time": "Fri Jun 10 15:09:05 2011 +0200" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Tue Jun 14 13:38:24 2011 +0200" }, "message": "avr32, exec: remove redundant set_fs(USER_DS)\n\nThe address limit is already set in flush_old_exec() so this\nset_fs(USER_DS) is redundant.\n\nSigned-off-by: Mathias Krause \u003cminipli@googlemail.com\u003e\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\n" }, { "commit": "c162755491f7ca9853cb9f2aaa3ff3677c1bda78", "tree": "92184780b6611f7ccdf2af4303d5bd5454e1db05", "parents": [ "3000f0077a5745918830f40826c23fe5bf934b8b" ], "author": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Mon Jun 06 18:19:20 2011 +0200" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Tue Jun 14 13:37:31 2011 +0200" }, "message": "avr32: make intc_resume() return void to conform to syscore_ops\n\nThis patch removes the unneeded, and now wrong, return 0 from intc_resume() and\nlets the function return void instead. This matches the resume callback in\nstruct syscore_ops.\n\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\n" }, { "commit": "3000f0077a5745918830f40826c23fe5bf934b8b", "tree": "7ea869e9f5cdbd64027ffb475d8f3bfe9df4c8d3", "parents": [ "a527a1453dd6dd89f07f1e5b2d24fc6559922461" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Sun May 15 00:23:32 2011 +0200" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Tue Jun 14 13:37:30 2011 +0200" }, "message": "avr32: add some more at91 to cpu.h definition\n\nSomme common drivers will need those at91 cpu_is_xxx() definitions.\nThose definitions are already in Linus\u0027 tree so if we want to use them\nin common drivers, we will need them in AVR32 cpu.h file.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\n" }, { "commit": "a527a1453dd6dd89f07f1e5b2d24fc6559922461", "tree": "98f5e616cf8e4abad94b5cd88e4a3b049977a180", "parents": [ "4137b31566fd112c8e2d9d4701de5e7a000bcc2d" ], "author": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Wed Jun 01 15:10:49 2011 +0200" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Tue Jun 14 13:37:29 2011 +0200" }, "message": "avr32: set CONFIG_CC_OPTIMIZE_FOR_SIZE\u003dy for all defconfigs\n\nThis patch makes sure the kconfig option CC_OPTIMIZE_FOR_SIZE is set to yes for\nall default configuration files. This ensures the kernel is optimized for size,\nand avoids potential relocation truncated to fit problems.\n\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\n" }, { "commit": "4137b31566fd112c8e2d9d4701de5e7a000bcc2d", "tree": "18dcd77d5b22a637a01c3ae9d1d98aab191e01d2", "parents": [ "7bbf1d46b28455aed6aa6df772b91d51408c6c81" ], "author": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Wed Jun 08 10:47:25 2011 +0200" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Tue Jun 14 13:37:29 2011 +0200" }, "message": "avr32/at32ap: fix mapping of platform device id for USART\n\nThis patch will fix the mapping of the platform device id when mapping USART\nperipheral ID to UART platform device id. Not setting the platform device id\nwill in most cases (when you map USART \u003e 0 to UART 0) make the console not\navailable.\n\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\n" }, { "commit": "7bbf1d46b28455aed6aa6df772b91d51408c6c81", "tree": "02302eb190b998c4019a30ecb027e7ce1da6fda6", "parents": [ "2c53b436a30867eb6b47dd7bab23ba638d1fb0d2" ], "author": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Wed Jun 01 11:08:01 2011 +0200" }, "committer": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Tue Jun 14 13:37:28 2011 +0200" }, "message": "avr32: fix use of non-existing portnr variable in at32_map_usart()\n\nThis patch fixes the use of the non-existing portnr variable in\nat32_map_usart() to use the provided line number instead. Typo was introduced\nin commit 2b348e2f82f532e3aff8e0ce9293033b3294c1e0.\n\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\n" }, { "commit": "28f65c11f2ffb3957259dece647a24f8ad2e241b", "tree": "6b7621d09d10df89eedd908d4506fb9f457a909f", "parents": [ "140a1ef2f91a00e1d25f0878c193abdc25bf6ebe" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jun 09 09:13:32 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Jun 10 14:55:36 2011 +0200" }, "message": "treewide: Convert uses of struct resource to resource_size(ptr)\n\nSeveral fixes as well where the +1 was missing.\n\nDone via coccinelle scripts like:\n\n@@\nstruct resource *ptr;\n@@\n\n- ptr-\u003eend - ptr-\u003estart + 1\n+ resource_size(ptr)\n\nand some grep and typing.\n\nMostly uncompiled, no cross-compilers.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "571503e10045c89af951962ea0bb783482663aad", "tree": "b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a", "parents": [ "29a6ccca3869bbe33879dae0cd7df2a1559eff54", "7b21fddd087678a70ad64afc0f632e0f1071b092" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:51:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:51:01 2011 -0700" }, "message": "Merge branch \u0027setns\u0027\n\n* setns:\n ns: Wire up the setns system call\n\nDone as a merge to make it easier to fix up conflicts in arm due to\naddition of sendmmsg system call\n" }, { "commit": "7b21fddd087678a70ad64afc0f632e0f1071b092", "tree": "c3ee152ab9b57b6cbc1ee3c6fd495c704ec47f66", "parents": [ "14d74e0cab7a7779a7ff0c3863c04c8a8e507106" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri May 27 19:28:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:48:39 2011 -0700" }, "message": "ns: Wire up the setns system call\n\n32bit and 64bit on x86 are tested and working. The rest I have looked\nat closely and I can\u0027t find any problems.\n\nsetns is an easy system call to wire up. It just takes two ints so I\ndon\u0027t expect any weird architecture porting problems.\n\nWhile doing this I have noticed that we have some architectures that are\nvery slow to get new system calls. cris seems to be the slowest where\nthe last system calls wired up were preadv and pwritev. avr32 is weird\nin that recvmmsg was wired up but never declared in unistd.h. frv is\nbehind with perf_event_open being the last syscall wired up. On h8300\nthe last system call wired up was epoll_wait. On m32r the last system\ncall wired up was fallocate. mn10300 has recvmmsg as the last system\ncall wired up. The rest seem to at least have syncfs wired up which was\nnew in the 2.6.39.\n\nv2: Most of the architecture support added by Daniel Lezcano \u003cdlezcano@fr.ibm.com\u003e\nv3: ported to v2.6.36-rc4 by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nv4: Moved wiring up of the system call to another patch\nv5: ported to v2.6.39-rc6\nv6: rebased onto parisc-next and net-next to avoid syscall conflicts.\nv7: ported to Linus\u0027s latest post 2.6.39 tree.\n\n\u003e  arch/blackfin/include/asm/unistd.h     |    3 ++-\n\u003e  arch/blackfin/mach-common/entry.S      |    1 +\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\n\nOh - ia64 wiring looks good.\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2a56d2220284b0e4dd8569fa475d7053f1c40a63", "tree": "96f959486a2f31db599e5f97167074bd1ecb3dc6", "parents": [ "46f2cc80514e389bacfb642a32a4181fa1f1d20b", "239df0fd5ee25588f8a5ba7f7ee646940cc403f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:51:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:51:32 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)\n ARM: 6945/1: Add unwinding support for division functions\n ARM: kill pmd_off()\n ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks\n ARM: 6943/1: mm: use TTBR1 instead of reserved context ID\n ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7\n ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area\n ARM: add sendmmsg syscall\n ARM: 6863/1: allow hotplug on msm\n ARM: 6832/1: mmci: support for ST-Ericsson db8500v2\n ARM: 6830/1: mach-ux500: force PrimeCell revisions\n ARM: 6829/1: amba: make hardcoded periphid override hardware\n ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID\n ARM: 6827/1: mach-netx: delete hardcoded periphid\n ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume\n ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2\n ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM\n ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM\n at91: drop at572d940hf support\n at91rm9200: introduce at91rm9200_set_type to specficy cpu package\n at91: drop boot_params and PLAT_PHYS_OFFSET\n ...\n" } ], "next": "239df0fd5ee25588f8a5ba7f7ee646940cc403f4" }