)]}' { "log": [ { "commit": "701b259f446be2f3625fb852bceb93afe76e206d", "tree": "93f15bcd00bd59c38b4e59fed9af7ddf6b06c8b3", "parents": [ "d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5", "efc3dbc37412c027e363736b4f4c74ee5e8ecffc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 15:51:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 24 15:51:40 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nDavem says:\n\n1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.\n\n2) tg3 header length computation correction from Eric Dumazet.\n\n3) More build and reference counting fixes for socket memory cgroup\n code from Glauber Costa.\n\n4) module.h snuck back into a core header after all the hard work we\n did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.\n\n5) Fix PHY naming regression and add some new PCI IDs in stmmac, from\n Alessandro Rubini.\n\n6) Netlink message generation fix in new team driver, should only advertise\n the entries that changed during events, from Jiri Pirko.\n\n7) SRIOV VF registration and unregistration fixes, and also add a\n missing PCI ID, from Roopa Prabhu.\n\n8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.\n\n9) ftgmac100/ftmac100 build fix, missing interrupt.h include.\n\n10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.\n\n11) Off by one fix in netem packet scheduler, from Vijay Subramanian.\n\n12) TCP loss detection fix from Yuchung Cheng.\n\n13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.\n\n14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.\n\n15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC\n congestion control modules, fix from Neal Cardwell.\n\n16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.\n\n17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.\n\n18) Statistics bug fixes in mlx4 from Eugenia Emantayev.\n\n19) rds locking bug fix during info dumps, from your\u0027s truly.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)\n rds: Make rds_sock_lock BH rather than IRQ safe.\n netprio_cgroup.h: dont include module.h from other includes\n net: flow_dissector.c missing include linux/export.h\n team: send only changed options/ports via netlink\n net/hyperv: fix possible memory leak in do_set_multicast()\n drivers/net: dsa/mv88e6xxx.c files need linux/module.h\n stmmac: added PCI identifiers\n llc: Fix race condition in llc_ui_recvmsg\n stmmac: fix phy naming inconsistency\n dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.\n tg3: fix ipv6 header length computation\n skge: add byte queue limit support\n mv643xx_eth: Add Rx Discard and Rx Overrun statistics\n bnx2x: fix compilation error with SOE in fw_dump\n bnx2x: handle CHIP_REVISION during init_one\n bnx2x: allow user to change ring size in ISCSI SD mode\n bnx2x: fix Big-Endianess in ethtool -t\n bnx2x: fixed ethtool statistics for MF modes\n bnx2x: credit-leakage fixup on vlan_mac_del_all\n macvlan: fix a possible use after free\n ...\n" }, { "commit": "ac1e3d4f5c1097422c6e72aeae322033e9a8c803", "tree": "adcebdad5f515a8453bfe48940822f57a6904c9d", "parents": [ "eaed435a7b870a38d89dbdb535c7842d618d3214", "e4c89a508f4385a0cd8681c2749a2cd2fa476e40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 15:11:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 15:11:27 2012 -0800" }, "message": "Merge tag \u0027pm-fixes-for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPower management fixes for 3.3\n\nTwo fixes for regressions introduced during the merge window, one fix for\na long-standing obscure issue in the computation of hibernate image size\nand two small PM documentation fixes.\n\n* tag \u0027pm-fixes-for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Sleep: Fix read_unlock_usermodehelper() call.\n PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression\n PM / Hibernate: Correct additional pages number calculation\n PM / Documentation: Fix minor issue in freezing_of_tasks.txt\n PM / Documentation: Fix spelling mistake in basic-pm-debugging.txt\n" }, { "commit": "a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99", "tree": "d92277ec77dbaf6f04a1ab4fe31a974c1ce51f76", "parents": [ "4f57d865f1d863346ac50db9c25859e73a86499c", "b4d20859362fde976bb2fa53eb51b798cdba1afc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 10:08:08 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 10:08:08 2012 -0800" }, "message": "Merge branch \u0027kernel-doc\u0027 from Randy Dunlap\n\nThe usual kernel-doc fixups from Randy. Some of them David acked as\nmerged in his tree, this is the random left-overs.\n\n* kernel-doc:\n docbook: fix sched source file names in device-drivers book\n docbook: change iomap source filename in deviceiobook\n docbook: don\u0027t use serial_core.h in device-drivers book\n kernel-doc: fix kernel-doc warnings in sched\n kernel-doc: fix new warnings in cfg80211.h\n kernel-doc: fix new warning in usb.h\n kernel-doc: fix new warnings in device.h\n kernel-doc: fix new warnings in debugfs\n kernel-doc: fix new warning in regulator core\n kernel-doc: fix new warnings in pci\n kernel-doc: fix new warnings in driver-core\n kernel-doc: fix new warnings in auditsc.c\n scripts/kernel-doc: fix fatal error caused by cfg80211.h\n" }, { "commit": "fa757281a08799fd6c0f7ec6f111d1cd66afc97b", "tree": "664f8728e55e3d37ca8eb3c6c9087d2da9860463", "parents": [ "2f6c76aa5f0fb53059730c628ac59ef62a14ed7a" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:03:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:54 2012 -0800" }, "message": "kernel-doc: fix kernel-doc warnings in sched\n\nFix new kernel-doc notation warnings:\n\nWarning(include/linux/sched.h:2094): No description found for parameter \u0027p\u0027\nWarning(include/linux/sched.h:2094): Excess function parameter \u0027tsk\u0027 description in \u0027is_idle_task\u0027\nWarning(kernel/sched/cpupri.c:139): No description found for parameter \u0027newpri\u0027\nWarning(kernel/sched/cpupri.c:139): Excess function parameter \u0027pri\u0027 description in \u0027cpupri_set\u0027\nWarning(kernel/sched/cpupri.c:208): Excess function parameter \u0027bootmem\u0027 description in \u0027cpupri_init\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc:\tIngo Molnar \u003cmingo@elte.hu\u003e\nCc:\tPeter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "42ae610c1a820ddecb80943d4ccfc936f7772535", "tree": "547550121b439c3e7d0f53b263117f275d938b53", "parents": [ "70c95b00b87f85ce5a15b7899aaa862eacd2364a" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 11:02:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:44:53 2012 -0800" }, "message": "kernel-doc: fix new warnings in auditsc.c\n\nFix new kernel-doc warnings in auditsc.c:\n\nWarning(kernel/auditsc.c:1875): No description found for parameter \u0027success\u0027\nWarning(kernel/auditsc.c:1875): No description found for parameter \u0027return_code\u0027\nWarning(kernel/auditsc.c:1875): Excess function parameter \u0027pt_regs\u0027 description in \u0027__audit_syscall_exit\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d496aab567e7e52b3e974c9192a5de6e77dce32c", "tree": "aa323c702bbf24567e4b7a244a135346f6aaeb5b", "parents": [ "2a4e64b8f6bcbf23ddd375b78342051ae8862284" ], "author": { "name": "Ananth N Mavinakayanahalli", "email": "ananth@in.ibm.com", "time": "Fri Jan 20 14:34:04 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 23 08:38:48 2012 -0800" }, "message": "kprobes: initialize before using a hlist\n\nCommit ef53d9c5e (\"kprobes: improve kretprobe scalability with hashed\nlocking\") introduced a bug where we can potentially leak\nkretprobe_instances since we initialize a hlist head after having used\nit.\n\nInitialize the hlist head before using it.\n\nReported by: Jim Keniston \u003cjkenisto@us.ibm.com\u003e\nAcked-by: Jim Keniston \u003cjkenisto@us.ibm.com\u003e\nSigned-off-by: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nAcked-by: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Srinivasa D S \u003csrinivasa@in.ibm.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0e90b31f4ba77027a7c21cbfc66404df0851ca21", "tree": "10dc6c443e2f058869d3953a90e6d48fb53f83ae", "parents": [ "8cfd14ad1eb52e44cb1fe7b47a68126e45e04026" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Fri Jan 20 04:57:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:46 2012 -0500" }, "message": "net: introduce res_counter_charge_nofail() for socket allocations\n\nThere is a case in __sk_mem_schedule(), where an allocation\nis beyond the maximum, but yet we are allowed to proceed.\nIt happens under the following condition:\n\n\tsk-\u003esk_wmem_queued + size \u003e\u003d sk-\u003esk_sndbuf\n\nThe network code won\u0027t revert the allocation in this case,\nmeaning that at some point later it\u0027ll try to do it. Since\nthis is never communicated to the underlying res_counter\ncode, there is an inbalance in res_counter uncharge operation.\n\nI see two ways of fixing this:\n\n1) storing the information about those allocations somewhere\n in memcg, and then deducting from that first, before\n we start draining the res_counter,\n2) providing a slightly different allocation function for\n the res_counter, that matches the original behavior of\n the network code more closely.\n\nI decided to go for #2 here, believing it to be more elegant,\nsince #1 would require us to do basically that, but in a more\nobscure way.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCC: Laurent Chavey \u003cchavey@google.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "567e47935a7cddd8e823c73bb8ee0b2805cd4940", "tree": "0d1ee0eb233b7f84084f779d32ef1fb2d5be755a", "parents": [ "99d1edc5c5ef5ee80982b354d57cef106cb8423c", "f7e6746ebae984ea67b0a1a1e23c7e6698240631", "6eadf1075c6f923fece419e38cf05bff559aefcd", "4f2f81a5621de47d42476d0b929be2e0d565df84" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 19 14:53:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 19 14:53:06 2012 -0800" }, "message": "Merge branches \u0027sched-urgent-for-linus\u0027, \u0027perf-urgent-for-linus\u0027 and \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched/accounting, proc: Fix /proc/stat interrupts sum\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n tracepoints/module: Fix disabling tracepoints with taint CRAP or OOT\n x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore\n x86/kprobes: Fix typo transferred from Intel manual\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits\n x86, tsc: Fix SMI induced variation in quick_pit_calibrate()\n x86, opcode: ANDN and Group 17 in x86-opcode-map.txt\n x86/kconfig: Move the ZONE_DMA entry under a menu\n x86/UV2: Add accounting for BAU strong nacks\n x86/UV2: Ack BAU interrupt earlier\n x86/UV2: Remove stale no-resources test for UV2 BAU\n x86/UV2: Work around BAU bug\n x86/UV2: Fix BAU destination timeout initialization\n x86/UV2: Fix new UV2 hardware by using native UV2 broadcast mode\n x86: Get rid of dubious one-bit signed bitfield\n" }, { "commit": "160cb5a97daef0cb894685d84c9d4700bb7cccb4", "tree": "91b8fd151fad423572a686ee94295a84754c0347", "parents": [ "5eb6f9ad96967be4e0da55521a253e11b534bd3f" ], "author": { "name": "Namhyung Kim", "email": "namhyung.kim@lge.com", "time": "Thu Jan 19 23:23:10 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Jan 19 23:23:10 2012 +0100" }, "message": "PM / Hibernate: Correct additional pages number calculation\n\nThe struct bm_block is allocated by chain_alloc(),\nso it\u0027d better counting it in LINKED_PAGE_DATA_SIZE.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung.kim@lge.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "f429ee3b808118591d1f3cdf3c0d0793911a5677", "tree": "96d848f5f677d96758ecd2aee5eb6931b75bf218", "parents": [ "22b4eb5e3174efb49791c62823d0cccc35394c36", "c158a35c8a681cf68d36f22f058f9f5466386c71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:06:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:41:31 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)\n audit: no leading space in audit_log_d_path prefix\n audit: treat s_id as an untrusted string\n audit: fix signedness bug in audit_log_execve_info()\n audit: comparison on interprocess fields\n audit: implement all object interfield comparisons\n audit: allow interfield comparison between gid and ogid\n audit: complex interfield comparison helper\n audit: allow interfield comparison in audit rules\n Kernel: Audit Support For The ARM Platform\n audit: do not call audit_getname on error\n audit: only allow tasks to set their loginuid if it is -1\n audit: remove task argument to audit_set_loginuid\n audit: allow audit matching on inode gid\n audit: allow matching on obj_uid\n audit: remove audit_finish_fork as it can\u0027t be called\n audit: reject entry,always rules\n audit: inline audit_free to simplify the look of generic code\n audit: drop audit_set_macxattr as it doesn\u0027t do anything\n audit: inline checks for not needing to collect aux records\n audit: drop some potentially inadvisable likely notations\n ...\n\nUse evil merge to fix up grammar mistakes in Kconfig file.\n\nBad speling and horrible grammar (and copious swearing) is to be\nexpected, but let\u0027s keep it to commit messages and comments, rather than\nexpose it to users in config help texts or printouts.\n" }, { "commit": "c158a35c8a681cf68d36f22f058f9f5466386c71", "tree": "54a7fe4d21a30848539b2bf94c885f0a0b123717", "parents": [ "41fdc3054e23e3229edea27053522fe052d02ec2" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Fri Jan 06 14:07:10 2012 -0800" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:04 2012 -0500" }, "message": "audit: no leading space in audit_log_d_path prefix\n\naudit_log_d_path() injects an additional space before the prefix,\nwhich serves no purpose and doesn\u0027t mix well with other audit_log*()\nfunctions that do not sneak extra characters into the log.\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "5afb8a3f96573f7ea018abb768f5b6ebe1a6c1a4", "tree": "da5f2278624eeb9dd09c91f3e9cfb6718a4b44ac", "parents": [ "10d68360871657204885371cdf2594412675d2f9" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Tue Dec 20 18:39:41 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:03 2012 -0500" }, "message": "audit: fix signedness bug in audit_log_execve_info()\n\nIn the loop, a size_t \"len\" is used to hold the return value of\naudit_log_single_execve_arg(), which returns -1 on error. In that\ncase the error handling (len \u003c\u003d 0) will be bypassed since \"len\" is\nunsigned, and the loop continues with (p +\u003d len) being wrapped.\nChange the type of \"len\" to signed int to fix the error handling.\n\n\tsize_t len;\n\t...\n\tfor (...) {\n\t\tlen \u003d audit_log_single_execve_arg(...);\n\t\tif (len \u003c\u003d 0)\n\t\t\tbreak;\n\t\tp +\u003d len;\n\t}\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "10d68360871657204885371cdf2594412675d2f9", "tree": "85a4fa8d3b0dc0a7bc525475325f955f75d3881d", "parents": [ "4a6633ed08af5ba67790b4d1adcdeb8ceb55677e" ], "author": { "name": "Peter Moody", "email": "pmoody@google.com", "time": "Wed Jan 04 15:24:31 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:03 2012 -0500" }, "message": "audit: comparison on interprocess fields\n\nThis allows audit to specify rules in which we compare two fields of a\nprocess. Such as is the running process uid !\u003d to the running process\neuid?\n\nSigned-off-by: Peter Moody \u003cpmoody@google.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "4a6633ed08af5ba67790b4d1adcdeb8ceb55677e", "tree": "8b658f732f742d3d3a40f84b39ce4aa42f70d538", "parents": [ "c9fe685f7a17a0ee8bf3fbe51e40b1c8b8e65896" ], "author": { "name": "Peter Moody", "email": "pmoody@google.com", "time": "Tue Dec 13 16:17:51 2011 -0800" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:02 2012 -0500" }, "message": "audit: implement all object interfield comparisons\n\nThis completes the matrix of interfield comparisons between uid/gid\ninformation for the current task and the uid/gid information for inodes.\naka I can audit based on differences between the euid of the process and\nthe uid of fs objects.\n\nSigned-off-by: Peter Moody \u003cpmoody@google.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "c9fe685f7a17a0ee8bf3fbe51e40b1c8b8e65896", "tree": "510a09bc02c5dccb7ef83c88f2a00546b17e2c17", "parents": [ "b34b039324bf081554ee8678f9b8c5d937e5206c" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:02 2012 -0500" }, "message": "audit: allow interfield comparison between gid and ogid\n\nAllow audit rules to compare the gid of the running task to the gid of the\ninode in question.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "b34b039324bf081554ee8678f9b8c5d937e5206c", "tree": "ff454dfed0580753defbeb87652bcf19faaf7800", "parents": [ "02d86a568c6d2d335256864451ac8ce781bc5652" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:02 2012 -0500" }, "message": "audit: complex interfield comparison helper\n\nRather than code the same loop over and over implement a helper function which\nuses some pointer magic to make it generic enough to be used numerous places\nas we implement more audit interfield comparisons\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "02d86a568c6d2d335256864451ac8ce781bc5652", "tree": "3ef085bd96cc79733cff28993379dbbd4b855813", "parents": [ "29ef73b7a823b77a7cd0bdd7d7cded3fb6c2587b" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:01 2012 -0500" }, "message": "audit: allow interfield comparison in audit rules\n\nWe wish to be able to audit when a uid\u003d500 task accesses a file which is\nuid\u003d0. Or vice versa. This patch introduces a new audit filter type\nAUDIT_FIELD_COMPARE which takes as an \u0027enum\u0027 which indicates which fields\nshould be compared. At this point we only define the task-\u003euid vs\ninode-\u003euid, but other comparisons can be added.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "4043cde8ecf7f7d880eb1133c201a3d392fd68c3", "tree": "d740c60e6b56565a7e996c3d0308e66f7c8651f8", "parents": [ "633b45454503489209b0d9a45f9e3cd1b852c614" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:01 2012 -0500" }, "message": "audit: do not call audit_getname on error\n\nJust a code cleanup really. We don\u0027t need to make a function call just for\nit to return on error. This also makes the VFS function even easier to follow\nand removes a conditional on a hot path.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "633b45454503489209b0d9a45f9e3cd1b852c614", "tree": "591363d3be6b773f872b979727d4ac1a9691ec82", "parents": [ "0a300be6d5be8f66cd96609334710c268d0bfdce" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:00 2012 -0500" }, "message": "audit: only allow tasks to set their loginuid if it is -1\n\nAt the moment we allow tasks to set their loginuid if they have\nCAP_AUDIT_CONTROL. In reality we want tasks to set the loginuid when they\nlog in and it be impossible to ever reset. We had to make it mutable even\nafter it was once set (with the CAP) because on update and admin might have\nto restart sshd. Now sshd would get his loginuid and the next user which\nlogged in using ssh would not be able to set his loginuid.\n\nSystemd has changed how userspace works and allowed us to make the kernel\nwork the way it should. With systemd users (even admins) are not supposed\nto restart services directly. The system will restart the service for\nthem. Thus since systemd is going to loginuid\u003d\u003d-1, sshd would get -1, and\nsshd would be allowed to set a new loginuid without special permissions.\n\nIf an admin in this system were to manually start an sshd he is inserting\nhimself into the system chain of trust and thus, logically, it\u0027s his\nloginuid that should be used! Since we have old systems I make this a\nKconfig option.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "0a300be6d5be8f66cd96609334710c268d0bfdce", "tree": "253d0d1e0aa28a6bdf883bb92e4b62fafe263563", "parents": [ "54d3218b31aee5bc9c859ae60fbde933d922448b" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:00 2012 -0500" }, "message": "audit: remove task argument to audit_set_loginuid\n\nThe function always deals with current. Don\u0027t expose an option\npretending one can use it for something. You can\u0027t.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "54d3218b31aee5bc9c859ae60fbde933d922448b", "tree": "ebc383920713c283133d885191d0c19cb049afd2", "parents": [ "efaffd6e4417860c67576ac760dd6e8bbd15f006" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: allow audit matching on inode gid\n\nMuch like the ability to filter audit on the uid of an inode collected, we\nshould be able to filter on the gid of the inode.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "efaffd6e4417860c67576ac760dd6e8bbd15f006", "tree": "a59ee886b609bbf761fb75744e5e468264c67ab5", "parents": [ "6422e78de6880c66a82af512d9bd0c85eb62e661" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: allow matching on obj_uid\n\nAllow syscall exit filter matching based on the uid of the owner of an\ninode used in a syscall. aka:\n\nauditctl -a always,exit -S open -F obj_uid\u003d0 -F perm\u003dwa\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "6422e78de6880c66a82af512d9bd0c85eb62e661", "tree": "9cce4d385a6508056be7645fd3511ab019b346f4", "parents": [ "7ff68e53ece8c175d2951bb8a30b3cce8f9c5579" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: remove audit_finish_fork as it can\u0027t be called\n\nAudit entry,always rules are not allowed and are automatically changed in\nexit,always rules in userspace. The kernel refuses to load such rules.\n\nThus a task in the middle of a syscall (and thus in audit_finish_fork())\ncan only be in one of two states: AUDIT_BUILD_CONTEXT or AUDIT_DISABLED.\nSince the current task cannot be in AUDIT_RECORD_CONTEXT we aren\u0027t every\ngoing to actually use the code in audit_finish_fork() since it will\nreturn without doing anything. Thus drop the code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "7ff68e53ece8c175d2951bb8a30b3cce8f9c5579", "tree": "cde525e879e2e2434b0e3b23248588f015f5df04", "parents": [ "a4ff8dba7d8ce5ceb43fb27df66292251cc73bdc" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:58 2012 -0500" }, "message": "audit: reject entry,always rules\n\nWe deprecated entry,always rules a long time ago. Reject those rules as\ninvalid.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "a4ff8dba7d8ce5ceb43fb27df66292251cc73bdc", "tree": "2c89a0a7a7dad853a2c2ec70417ef2f3f5a04fd4", "parents": [ "38cdce53daa0408a61fe6d86fe48f31515c9b840" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:58 2012 -0500" }, "message": "audit: inline audit_free to simplify the look of generic code\n\nmake the conditional a static inline instead of doing it in generic code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "07c49417877f8658a6aa0ad9b4e21e4fd4df11b6", "tree": "59a64b96c9f35b8559db4c46b5a43d2d9510c190", "parents": [ "56179a6ec65a56e0279a58e35cb450d38f061b94" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:57 2012 -0500" }, "message": "audit: inline checks for not needing to collect aux records\n\nA number of audit hooks make function calls before they determine that\nauxilary records do not need to be collected. Do those checks as static\ninlines since the most common case is going to be that records are not\nneeded and we can skip the function call overhead.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "56179a6ec65a56e0279a58e35cb450d38f061b94", "tree": "7dc8b775719d7c731f1d2c279d5e5a105309adfb", "parents": [ "997f5b6444f4608692ec807fb802fd9767c80e76" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:57 2012 -0500" }, "message": "audit: drop some potentially inadvisable likely notations\n\nThe audit code makes heavy use of likely() and unlikely() macros, but they\ndon\u0027t always make sense. Drop any that seem questionable and let the\ncomputer do it\u0027s thing.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "997f5b6444f4608692ec807fb802fd9767c80e76", "tree": "3f523cd7aa1a8ab836ad2d494752364dde5b5eac", "parents": [ "b05d8447e7821695bc2fa3359431f7a664232743" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:57 2012 -0500" }, "message": "audit: remove AUDIT_SETUP_CONTEXT as it isn\u0027t used\n\nAudit contexts have 3 states. Disabled, which doesn\u0027t collect anything,\nbuild, which collects info but might not emit it, and record, which\ncollects and emits. There is a 4th state, setup, which isn\u0027t used. Get\nrid of it.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "b05d8447e7821695bc2fa3359431f7a664232743", "tree": "da90e558279c6407aa2e08d36bea5d9a21cd959c", "parents": [ "f031cd25568a390dc2c9c3a4015054183753449a" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:56 2012 -0500" }, "message": "audit: inline audit_syscall_entry to reduce burden on archs\n\nEvery arch calls:\n\nif (unlikely(current-\u003eaudit_context))\n\taudit_syscall_entry()\n\nwhich requires knowledge about audit (the existance of audit_context) in\nthe arch code. Just do it all in static inline in audit.h so that arch\u0027s\ncan remain blissfully ignorant.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "d7e7528bcd456f5c36ad4a202ccfb43c5aa98bc4", "tree": "ef49503b1dc52c52102e728dbd979c9309d5756b", "parents": [ "85e7bac33b8d5edafc4e219c7dfdb3d48e0b4e31" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:56 2012 -0500" }, "message": "Audit: push audit success and retcode into arch ptrace.h\n\nThe audit system previously expected arches calling to audit_syscall_exit to\nsupply as arguments if the syscall was a success and what the return code was.\nAudit also provides a helper AUDITSC_RESULT which was supposed to simplify things\nby converting from negative retcodes to an audit internal magic value stating\nsuccess or failure. This helper was wrong and could indicate that a valid\npointer returned to userspace was a failed syscall. The fix is to fix the\nlayering foolishness. We now pass audit_syscall_exit a struct pt_reg and it\nin turns calls back into arch code to collect the return value and to\ndetermine if the syscall was a success or failure. We also define a generic\nis_syscall_success() macro which determines success/failure based on if the\nvalue is \u003c -MAX_ERRNO. This works for arches like x86 which do not use a\nseparate mechanism to indicate syscall failure.\n\nWe make both the is_syscall_success() and regs_return_value() static inlines\ninstead of macros. The reason is because the audit function must take a void*\nfor the regs. (uml calls theirs struct uml_pt_regs instead of just struct\npt_regs so audit_syscall_exit can\u0027t take a struct pt_regs). Since the audit\nfunction takes a void* we need to use static inlines to cast it back to the\narch correct structure to dereference it.\n\nThe other major change is that on some arches, like ia64, MIPS and ppc, we\nchange regs_return_value() to give us the negative value on syscall failure.\nTHE only other user of this macro, kretprobe_example.c, won\u0027t notice and it\nmakes the value signed consistently for the audit functions across all archs.\n\nIn arch/sh/kernel/ptrace_64.c I see that we were using regs[9] in the old\naudit code as the return value. But the ptrace_64.h code defined the macro\nregs_return_value() as regs[3]. I have no idea which one is correct, but this\npatch now uses the regs_return_value() function, so it now uses regs[3].\n\nFor powerpc we previously used regs-\u003eresult but now use the\nregs_return_value() function which uses regs-\u003egprs[3]. regs-\u003egprs[3] is\nalways positive so the regs_return_value(), much like ia64 makes it negative\nbefore calling the audit code when appropriate.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e [for x86 portion]\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e [for ia64]\nAcked-by: Richard Weinberger \u003crichard@nod.at\u003e [for uml]\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e [for sparc]\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e [for mips]\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e [for ppc]\n" }, { "commit": "85e7bac33b8d5edafc4e219c7dfdb3d48e0b4e31", "tree": "6a1f178de829d2219a65a8563e12f2c8029d4b13", "parents": [ "16c174bd95cb07c9d0ad3fcd8c70f9cea7214c9d" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:05 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:55 2012 -0500" }, "message": "seccomp: audit abnormal end to a process due to seccomp\n\nThe audit system likes to collect information about processes that end\nabnormally (SIGSEGV) as this may me useful intrusion detection information.\nThis patch adds audit support to collect information when seccomp forces a\ntask to exit because of misbehavior in a similar way.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "16c174bd95cb07c9d0ad3fcd8c70f9cea7214c9d", "tree": "3264c533da56cc81988331fd0d3f42f3d2ba3183", "parents": [ "3035c51e8ac0512686ceb9f2bd1d13bdc6e4fb29" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:05 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:55 2012 -0500" }, "message": "audit: check current inode and containing object when filtering on major and minor\n\nThe audit system has the ability to filter on the major and minor number of\nthe device containing the inode being operated upon. Lets say that\n/dev/sda1 has major,minor 8,1 and that we mount /dev/sda1 on /boot. Now lets\nsay we add a watch with a filter on 8,1. If we proceed to open an inode\ninside /boot, such as /vboot/vmlinuz, we will match the major,minor filter.\n\nLets instead assume that one were to use a tool like debugfs and were to\nopen /dev/sda1 directly and to modify it\u0027s contents. We might hope that\nthis would also be logged, but it isn\u0027t. The rules will check the\nmajor,minor of the device containing /dev/sda1. In other words the rule\nwould match on the major/minor of the tmpfs mounted at /dev.\n\nI believe these rules should trigger on either device. The man page is\ndevoid of useful information about the intended semantics. It only seems\nlogical that if you want to know everything that happened on a major,minor\nthat would include things that happened to the device itself...\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "3035c51e8ac0512686ceb9f2bd1d13bdc6e4fb29", "tree": "7c26ee810b6d6678f960cf1bb5880055ac4c793f", "parents": [ "5195d8e217a78697152d64fc09a16e063a022465" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:05 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:54 2012 -0500" }, "message": "audit: drop the meaningless and format breaking word \u0027user\u0027\n\nuserspace audit messages look like so:\n\ntype\u003dUSER msg\u003daudit(1271170549.415:24710): user pid\u003d14722 uid\u003d0 auid\u003d500 ses\u003d1 subj\u003dunconfined_u:unconfined_r:auditctl_t:s0-s0:c0.c1023 msg\u003d\u0027\u0027\n\nThat third field just says \u0027user\u0027. That\u0027s useless and doesn\u0027t follow the\nkey\u003dvalue pair we are trying to enforce. We already know it came from the\nuser based on the record type. Kill that word. Die.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "5195d8e217a78697152d64fc09a16e063a022465", "tree": "6d8d980037d95740d0f64ba9491c0e5a38f31ea3", "parents": [ "5ef30ee53b187786e64bdc1f8109e39d17f2ce58" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:05 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:54 2012 -0500" }, "message": "audit: dynamically allocate audit_names when not enough space is in the names array\n\nThis patch does 2 things. First it reduces the number of audit_names\nallocated in every audit context from 20 to 5. 5 should be enough for all\n\u0027normal\u0027 syscalls (rename being the worst). Some syscalls can still touch\nmore the 5 inodes such as mount. When rpc filesystem is mounted it will\ncreate inodes and those can exceed 5. To handle that problem this patch will\ndynamically allocate audit_names if it needs more than 5. This should\ndecrease the typicall memory usage while still supporting all the possible\nkernel operations.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "5ef30ee53b187786e64bdc1f8109e39d17f2ce58", "tree": "05c5f2aebedfdaf1dc81afa0a50271a1a581a069", "parents": [ "9fc5c3e3237e02a94f41cd1d2b4291593d29791d" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:05 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:54 2012 -0500" }, "message": "audit: make filetype matching consistent with other filters\n\nEvery other filter that matches part of the inodes list collected by audit\nwill match against any of the inodes on that list. The filetype matching\nhowever had a strange way of doing things. It allowed userspace to\nindicated if it should match on the first of the second name collected by\nthe kernel. Name collection ordering seems like a kernel internal and\nmaking userspace rules get that right just seems like a bad idea. As it\nturns out the userspace audit writers had no idea it was doing this and\nthus never overloaded the value field. The kernel always checked the first\nname collected which for the tested rules was always correct.\n\nThis patch just makes the filetype matching like the major, minor, inode,\nand LSM rules in that it will match against any of the names collected. It\nalso changes the rule validation to reject the old unused rule types.\n\nNoone knew it was there. Noone used it. Why keep around the extra code?\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "951880e634a79884236a575b896abf55c39ae0bf", "tree": "b23ec5a95cd72083227ed5b7396e2f8799f4a58c", "parents": [ "c2bc3a316a7281f67e36b34dac2802cbe36a9128" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:19:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:19:41 2012 -0800" }, "message": "Revert \"capabitlies: ns_capable can use the cap helpers rather than lsm call\"\n\nThis reverts commit d2a7009f0bb03fa22ad08dd25472efa0568126b9.\n\nJ. R. Okajima explains:\n\n \"After this commit, I am afraid access(2) on NFS may not work\n correctly. The scenario based upon my guess.\n - access(2) overrides the credentials.\n - calls inode_permission() -- ... -- generic_permission() --\n ns_capable().\n - while the old ns_capable() calls security_capable(current_cred()),\n the new ns_capable() calls has_ns_capability(current) --\n security_capable(__task_cred(t)).\n\n current_cred() returns current-\u003ecred which is effective (overridden)\n credentials, but __task_cred(current) returns current-\u003ereal_cred (the\n NFSD\u0027s credential). And the overridden credentials by access(2) lost.\"\n\nRequested-by: J. R. Okajima \u003chooanon05@yahoo.co.jp\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "97740400bc76b64781d01f8cdfbcf750582006ef", "tree": "85900329fbce72011339ab2348dcf13dde2a64fd", "parents": [ "408e057870c8680a50963b08f9f7efaa151a74ec", "ee34a37049114303011e154478c63b977bcff24c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:02:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 16 15:02:30 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:\n PM / Hibernate: Drop the check of swap space size for compressed image\n PM / shmobile: fix A3SP suspend method\n PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset\n PM / Domains: Fix build for CONFIG_PM_SLEEP unset\n PM: Make sysrq-o be available for CONFIG_PM unset\n" }, { "commit": "c10076c4304083af15a41f6bc5e657e781c1f9a6", "tree": "0a9fd7219177cc3d3cb9afe89fb3931c2fc1defd", "parents": [ "2e885057b7f75035f0b85e02f737891482815a81" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Jan 13 21:40:59 2012 -0500" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jan 16 11:35:57 2012 -0500" }, "message": "tracepoints/module: Fix disabling tracepoints with taint CRAP or OOT\n\nTracepoints are disabled for tainted modules, which is usually because the\nmodule is either proprietary or was forced, and we don\u0027t want either of them\nusing kernel tracepoints.\n\nBut, a module can also be tainted by being in the staging directory or\ncompiled out of tree. Either is fine for use with tracepoints, no need\nto punish them. I found this out when I noticed that my sample trace event\nmodule, when done out of tree, stopped working.\n\nCc: stable@vger.kernel.org # 3.2\nCc: Mathieu Desnoyers \u003cmathieu.desnoyers@efficios.com\u003e\nCc: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "53999bf34d55981328f8ba9def558d3e104d6e36", "tree": "4ca98169e5c96c1ec8e04d15fce75c60a8b9578d", "parents": [ "122804ecb59493fbb4d31b3ba9ac59faaf45276f" ], "author": { "name": "Kevin Winchester", "email": "kjwinchester@gmail.com", "time": "Sun Jan 15 19:32:55 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 16:21:07 2012 -0800" }, "message": "error: implicit declaration of function \u0027module_flags_taint\u0027\n\nRecent changes to kernel/module.c caused the following compile\nerror:\n\n kernel/module.c: In function ‘show_taint’:\n kernel/module.c:1024:2: error: implicit declaration of function ‘module_flags_taint’ [-Werror\u003dimplicit-function-declaration]\n cc1: some warnings being treated as errors\n\nCorrect this error by moving the definition of module_flags_taint\noutside of the #ifdef CONFIG_MODULE_UNLOAD section.\n\nSigned-off-by: Kevin Winchester \u003ckjwinchester@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b3c9dd182ed3bdcdaf0e42625a35924b0497afdc", "tree": "ad48ad4d923fee147c736318d0fad35b3755f4f5", "parents": [ "83c2f912b43c3a7babbb6cb7ae2a5276c1ed2a3e", "5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "message": "Merge branch \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block: (37 commits)\n Revert \"block: recursive merge requests\"\n block: Stop using macro stubs for the bio data integrity calls\n blockdev: convert some macros to static inlines\n fs: remove unneeded plug in mpage_readpages()\n block: Add BLKROTATIONAL ioctl\n block: Introduce blk_set_stacking_limits function\n block: remove WARN_ON_ONCE() in exit_io_context()\n block: an exiting task should be allowed to create io_context\n block: ioc_cgroup_changed() needs to be exported\n block: recursive merge requests\n block, cfq: fix empty queue crash caused by request merge\n block, cfq: move icq creation and rq-\u003eelv.icq association to block core\n block, cfq: restructure io_cq creation path for io_context interface cleanup\n block, cfq: move io_cq exit/release to blk-ioc.c\n block, cfq: move icq cache management to block core\n block, cfq: move io_cq lookup to blk-ioc.c\n block, cfq: move cfqd-\u003eicq_list to request_queue and add request-\u003eelv.icq\n block, cfq: reorganize cfq_io_context into generic and cfq specific parts\n block: remove elevator_queue-\u003eops\n block: reorder elevator switch sequence\n ...\n\nFix up conflicts in:\n - block/blk-cgroup.c\n\tSwitch from can_attach_task to can_attach\n - block/cfq-iosched.c\n\tconflict with now removed cic index changes (we now use q-\u003eid instead)\n" }, { "commit": "83c2f912b43c3a7babbb6cb7ae2a5276c1ed2a3e", "tree": "eaa7f50dea154d9f19721db69c7adde64d48848f", "parents": [ "f0ed5b9a28536b8be2f578a9450cfa42ab31ccf8", "172d1b0b73256551f100fc00c69e356d047103f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:35 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)\n perf tools: Fix compile error on x86_64 Ubuntu\n perf report: Fix --stdio output alignment when --showcpuutilization used\n perf annotate: Get rid of field_sep check\n perf annotate: Fix usage string\n perf kmem: Fix a memory leak\n perf kmem: Add missing closedir() calls\n perf top: Add error message for EMFILE\n perf test: Change type of \u0027-v\u0027 option to INCR\n perf script: Add missing closedir() calls\n tracing: Fix compile error when static ftrace is enabled\n recordmcount: Fix handling of elf64 big-endian objects.\n perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again\n perf tools: Add support for guest/host-only profiling\n perf kvm: Do guest-only counting by default\n perf top: Don\u0027t update total_period on process_sample\n perf hists: Stop using \u0027self\u0027 for struct hist_entry\n perf hists: Rename total_session to total_period\n x86: Add counter when debug stack is used with interrupts enabled\n x86: Allow NMIs to hit breakpoints in i386\n x86: Keep current stack in NMI breakpoints\n ...\n" }, { "commit": "c49c41a4134679cecb77362e7f6b59acb6320aa7", "tree": "45e690c036ca5846a48c8be67945d1d841b2d96d", "parents": [ "892d208bcf79e4e1058707786a7b6d486697cd78", "f423e5ba76e7e4a6fcb4836b4f072d1fdebba8b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security:\n capabilities: remove __cap_full_set definition\n security: remove the security_netlink_recv hook as it is equivalent to capable()\n ptrace: do not audit capability check when outputing /proc/pid/stat\n capabilities: remove task_ns_* functions\n capabitlies: ns_capable can use the cap helpers rather than lsm call\n capabilities: style only - move capable below ns_capable\n capabilites: introduce new has_ns_capabilities_noaudit\n capabilities: call has_ns_capability from has_capability\n capabilities: remove all _real_ interfaces\n capabilities: introduce security_capable_noaudit\n capabilities: reverse arguments to security_capable\n capabilities: remove the task from capable LSM hook entirely\n selinux: sparse fix: fix several warnings in the security server cod\n selinux: sparse fix: fix warnings in netlink code\n selinux: sparse fix: eliminate warnings for selinuxfs\n selinux: sparse fix: declare selinux_disable() in security.h\n selinux: sparse fix: move selinux_complete_init\n selinux: sparse fix: make selinux_secmark_refcount static\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n\nManually fix up a semantic mis-merge wrt security_netlink_recv():\n\n - the interface was removed in commit fd7784615248 (\"security: remove\n the security_netlink_recv hook as it is equivalent to capable()\")\n\n - a new user of it appeared in commit a38f7907b926 (\"crypto: Add\n userspace configuration API\")\n\ncausing no automatic merge conflict, but Eric Paris pointed out the\nissue.\n" }, { "commit": "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "tree": "a112335f2b2b2a51e90531c6c67e8a3b54dcf0ef", "parents": [ "0b48d42235caf627121f440b57d376f48a9af8b6", "72db395ffadb1d33233fd123c2bf87ba0198c6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nAutogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n module_param: check that bool parameters really are bool.\n intelfbdrv.c: bailearly is an int module_param\n paride/pcd: fix bool verbose module parameter.\n module_param: make bool parameters really bool (drivers \u0026 misc)\n module_param: make bool parameters really bool (arch)\n module_param: make bool parameters really bool (core code)\n kernel/async: remove redundant declaration.\n printk: fix unnecessary module_param_name.\n lirc_parallel: fix module parameter description.\n module_param: avoid bool abuse, add bint for special cases.\n module_param: check type correctness for module_param_array\n modpost: use linker section to generate table.\n modpost: use a table rather than a giant if/else statement.\n modules: sysfs - export: taint, coresize, initsize\n kernel/params: replace DEBUGP with pr_debug\n module: replace DEBUGP with pr_debug\n module: struct module_ref should contains long fields\n module: Fix performance regression on modules with large symbol tables\n module: Add comments describing how the \"strmap\" logic works\n\nFix up conflicts in scripts/mod/file2alias.c due to the new linker-\ngenerated table approach to adding __mod_*_device_table entries. The\nARM sa11x0 mcp bus needed to be converted to that too.\n" }, { "commit": "ee34a37049114303011e154478c63b977bcff24c", "tree": "b33342752535473f07742206395049233579d12b", "parents": [ "a029db43986e23677498ab4d84bb61b05de83484" ], "author": { "name": "Barry Song", "email": "Baohua.Song@csr.com", "time": "Mon Jan 09 12:56:23 2012 +0800" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Jan 14 00:41:37 2012 +0100" }, "message": "PM / Hibernate: Drop the check of swap space size for compressed image\n\nFor compressed image, the space required is not known until\nwe finish compressing and writing all pages.\nThis patch drops the check, and if swap space is not enough\nfinally, system can still restore to normal after writing\nswap fails for compressed images.\n\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "dae5cbc2440b1d21a15715d0f1fb20f632dd38ee", "tree": "7cfb0b0cddcaff333bef271c54406bbdc505a75b", "parents": [ "96e80a7851b44f3decaac0625665cd64e550b71d" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Jan 14 00:33:03 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Jan 14 00:33:03 2012 +0100" }, "message": "PM: Make sysrq-o be available for CONFIG_PM unset\n\nAfter commit 1eb208aea3179dd2fc0cdeea45ef869d75b4fe70, \"PM: Make\nCONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)\", the\nfiles under kernel/power are not built unless CONFIG_PM_SLEEP or\nCONFIG_PM_RUNTIME is set. In particular, this causes\nkernel/power/poweroff.c to be omitted, even though it should be\ncompiled, because CONFIG_MAGIC_SYSRQ is set.\n\nFix the problem by causing kernel/power/Makefile to be processed\nfor CONFIG_PM unset too.\n\nReported-and-tested-by: Phil Oester \u003ckernel@linuxace.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "028ee4be34a09a6d48bdf30ab991ae933a7bc036", "tree": "455783226ceb65aee100f86afed529d4bbde1c8b", "parents": [ "b3f7f573a20081910e34e99cbc91831f4f02f1ff" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu Jan 12 17:20:55 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:13 2012 -0800" }, "message": "c/r: prctl: add PR_SET_MM codes to set up mm_struct entries\n\nWhen we restore a task we need to set up text, data and data heap sizes\nfrom userspace to the values a task had at checkpoint time. This patch\nadds auxilary prctl codes for that.\n\nWhile most of them have a statistical nature (their values are involved\ninto calculation of /proc/\u003cpid\u003e/statm output) the start_brk and brk values\nare used to compute an allowed size of program data segment expansion.\nWhich means an arbitrary changes of this values might be dangerous\noperation. So to restrict access the following requirements applied to\nprctl calls:\n\n - The process has to have CAP_SYS_ADMIN capability granted.\n - For all opcodes except start_brk/brk members an appropriate\n VMA area must exist and should fit certain VMA flags,\n such as:\n - code segment must be executable but not writable;\n - data segment must not be executable.\n\nstart_brk/brk values must not intersect with data segment and must not\nexceed RLIMIT_DATA resource limit.\n\nStill the main guard is CAP_SYS_ADMIN capability check.\n\nNote the kernel should be compiled with CONFIG_CHECKPOINT_RESTORE support\notherwise these prctl calls will return -EINVAL.\n\n[akpm@linux-foundation.org: cache current-\u003emm in a local, saving 200 bytes text]\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Andrew Vagin \u003cavagin@openvz.org\u003e\nCc: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@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": "6e6f0a1f0fa6bba1493c296eb30d1e176e1f8530", "tree": "c1bbacbc93e5b6f7759d509d7cf6207ad5b3ee65", "parents": [ "b8f566b04d3cddd192cfd2418ae6d54ac6353792" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Thu Jan 12 17:20:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "panic: don\u0027t print redundant backtraces on oops\n\nWhen an oops causes a panic and panic prints another backtrace it\u0027s pretty\ncommon to have the original oops data be scrolled away on a 80x50 screen.\n\nThe second backtrace is quite redundant and not needed anyways.\n\nSo don\u0027t print the panic backtrace when oops_in_progress is true.\n\n[akpm@linux-foundation.org: add comment]\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b8f566b04d3cddd192cfd2418ae6d54ac6353792", "tree": "32a5bf86548cd43feff4822d800b6a99e157b5d7", "parents": [ "f5138e42211d4e8bfbd6ac5b3816348da1533433" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Thu Jan 12 17:20:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "sysctl: add the kernel.ns_last_pid control\n\nThe sysctl works on the current task\u0027s pid namespace, getting and setting\nits last_pid field.\n\nWriting is allowed for CAP_SYS_ADMIN-capable tasks thus making it possible\nto create a task with desired pid value. This ability is required badly\nfor the checkpoint/restore in userspace.\n\nThis approach suits all the parties for now.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "93e13a360ba331915220f82f6e9543df961ffa1f", "tree": "470c120ee5d3de69f46e62ec85452bee14e8d67c", "parents": [ "bec013c40bc89671d8d457944fdf7d2b8e79d651" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Thu Jan 12 17:20:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kdump: fix crash_kexec()/smp_send_stop() race in panic()\n\nWhen two CPUs call panic at the same time there is a possible race\ncondition that can stop kdump. The first CPU calls crash_kexec() and the\nsecond CPU calls smp_send_stop() in panic() before crash_kexec() finished\non the first CPU. So the second CPU stops the first CPU and therefore\nkdump fails:\n\n1st CPU:\n panic()-\u003ecrash_kexec()-\u003emutex_trylock(\u0026kexec_mutex)-\u003e do kdump\n\n2nd CPU:\n panic()-\u003ecrash_kexec()-\u003ekexec_mutex already held by 1st CPU\n -\u003esmp_send_stop()-\u003e stop 1st CPU (stop kdump)\n\nThis patch fixes the problem by introducing a spinlock in panic that\nallows only one CPU to process crash_kexec() and the subsequent panic\ncode.\n\nAll other CPUs call the weak function panic_smp_self_stop() that stops the\nCPU itself. This function can be overloaded by architecture code. For\nexample \"tile\" can use their lower-power \"nap\" instruction for that.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nAcked-by: 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": "bec013c40bc89671d8d457944fdf7d2b8e79d651", "tree": "f48220571120805a319f0df876c1cc465586978e", "parents": [ "6480e5a0923756b500634d9777ec4189492fbbfe" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Thu Jan 12 17:20:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kdump: crashk_res init check for /sys/kernel/kexec_crash_size\n\nCurrently it is possible to set the crash_size via the sysfs\n/sys/kernel/kexec_crash_size even if no crash kernel memory has been\ndefined with the \"crashkernel\" parameter. In this case \"crashk_res\" is\nnot initialized and crashk_res.start \u003d crashk_res.end \u003d 0. Unfortunately\nresource_size(\u0026crashk_res) returns 1 in this case. This breaks the s390\nimplementation of crash_(un)map_reserved_pages().\n\nTo fix the problem the correct \"old_size\" is now calculated in\ncrash_shrink_memory(). \"old_size is set to \"0\" if crashk_res is not\ninitialized. With this change crash_shrink_memory() will do nothing, when\n\"crashk_res\" is not initialized. It will return \"0\" for \"echo 0 \u003e\n/sys/kernel/kexec_crash_size\" and -EINVAL for \"echo [not zero] \u003e\n/sys/kernel/kexec_crash_size\".\n\nIn addition to that this patch also simplifies the \"ret \u003d -EINVAL\" vs.\n\"ret \u003d 0\" logic as suggested by Simon Horman.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nReviewed-by: Dave Young \u003cdyoung@redhat.com\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nReviewed-by: Simon Horman \u003chorms@verge.net.au\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6480e5a0923756b500634d9777ec4189492fbbfe", "tree": "0b1d26ce39f9b7cd28a9e82627ee837734f7c3ab", "parents": [ "a3dd3323058d281abd584b15ad4c5b65064d7a61" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Thu Jan 12 17:20:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kdump: add missing RAM resource in crash_shrink_memory()\n\nWhen shrinking crashkernel memory using /sys/kernel/kexec_crash_size for\nthe newly added memory no RAM resource is created at the moment.\n\nExample:\n\n $ cat /proc/iomem\n 00000000-bfffffff : System RAM\n 00000000-005b7ac3 : Kernel code\n 005b7ac4-009743bf : Kernel data\n 009bb000-00a85c33 : Kernel bss\n c0000000-cfffffff : Crash kernel\n d0000000-ffffffff : System RAM\n\n $ echo 0 \u003e /sys/kernel/kexec_crash_size\n $ cat /proc/iomem\n 00000000-bfffffff : System RAM\n 00000000-005b7ac3 : Kernel code\n 005b7ac4-009743bf : Kernel data\n 009bb000-00a85c33 : Kernel bss\n \u003c\u003c-- here is System RAM missing\n d0000000-ffffffff : System RAM\n\nOne result of this bug is that the memory chunk can never be set offline\nusing memory hotplug. With this patch I insert a new \"System RAM\"\nresource for the released memory. Then the upper example looks like the\nfollowing:\n\n $ echo 0 \u003e /sys/kernel/kexec_crash_size\n $ cat /proc/iomem\n 00000000-bfffffff : System RAM\n 00000000-005b7ac3 : Kernel code\n 005b7ac4-009743bf : Kernel data\n 009bb000-00a85c33 : Kernel bss\n c0000000-cfffffff : System RAM \u003c\u003c-- new rescoure\n d0000000-ffffffff : System RAM\n\nAnd now I can set chunk c0000000-cfffffff offline.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a3dd3323058d281abd584b15ad4c5b65064d7a61", "tree": "98c65337f9960db2d0ca55687314bb821f3e7c1f", "parents": [ "9512938b885304f72c847379611d6018064af840" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 12 17:20:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kexec: remove KMSG_DUMP_KEXEC\n\nKMSG_DUMP_KEXEC is useless because we already save kernel messages inside\n/proc/vmcore, and it is unsafe to allow modules to do other stuffs in a\ncrash dump scenario.\n\n[akpm@linux-foundation.org: fix powerpc build]\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nReported-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "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": "efeb156e7275c5b6c6e0f96aceb3c6abf98fc392", "tree": "651970d08c18d8934bcdcc7f01d3c9876fc2ef6a", "parents": [ "a2ef990ab5a6705a356d146dd773a3b359787497" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Jan 12 17:17:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:02 2012 -0800" }, "message": "kprobes: silence DEBUG_STRICT_USER_COPY_CHECKS\u003dy warning\n\nEnabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:\n\n In file included from arch/x86/include/asm/uaccess.h:573,\n from kernel/kprobes.c:55:\n In function \u0027copy_from_user\u0027,\n inlined from \u0027write_enabled_file_bool\u0027 at\n kernel/kprobes.c:2191:\n arch/x86/include/asm/uaccess_64.h:65:\n warning: call to \u0027copy_from_user_overflow\u0027 declared with attribute warning: copy_from_user() buffer size is not provably correct\n\npresumably due to buf_size being signed causing GCC to fail to see that\nbuf_size can\u0027t become negative.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Anil S Keshavamurthy \u003canil.s.keshavamurthy@intel.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2329abfa344a9a824bc4c71f2415528777265510", "tree": "7779fadc6ceba76071e3f5db0ec6a1dee41a0dfd", "parents": [ "6d6a55ec0877393f467067d44b9a2a8c2e4a82d2" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:18 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:18 2012 +1030" }, "message": "module_param: make bool parameters really bool (core code)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6d6a55ec0877393f467067d44b9a2a8c2e4a82d2", "tree": "112aad751ea0cff183f926cf4e833ccb7d6e7fd4", "parents": [ "29d4d6df107b9d86982dc759f5b1ddfe2c6b29c0" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:18 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:18 2012 +1030" }, "message": "kernel/async: remove redundant declaration.\n\nIt\u0027s in linux/init.h, and I\u0027m about to change it to a bool.\n\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "29d4d6df107b9d86982dc759f5b1ddfe2c6b29c0", "tree": "270450c3ad8de1b5164d671209ea92f13175660f", "parents": [ "f17dda94d48b654c793da6632f65654476291ba5" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:17 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:17 2012 +1030" }, "message": "printk: fix unnecessary module_param_name.\n\nYou don\u0027t need module_param_name if the name is the same!\n\nCc: Yanmin Zhang \u003cyanmin_zhang@linux.intel.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "69116f279a9eaf4c540934269342d9149538fc79", "tree": "eb335b97a99fb25ce548dd06f053a81e3c56016f", "parents": [ "bafeafeab94b8d3019aac15c2df2ce47b08a6363" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:17 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:17 2012 +1030" }, "message": "module_param: avoid bool abuse, add bint for special cases.\n\nFor historical reasons, we allow module_param(bool) to take an int (or\nan unsigned int). That\u0027s going away.\n\nA few drivers really want an int: they set it to -1 and a parameter\nwill set it to 0 or 1. This sucks: reading them from sysfs will give\n\u0027Y\u0027 for both -1 and 1, but if we change it to an int, then the users\nmight be broken (if they did \"param\" instead of \"param\u003d1\").\n\nUse a new \u0027bint\u0027 parser for them.\n\n(ntfs has a different problem: it needs an int for debug_msgs because\nit\u0027s also exposed via sysctl.)\n\nCc: Steve Glendinning \u003csteve.glendinning@smsc.com\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: Hoang-Nam Nguyen \u003chnguyen@de.ibm.com\u003e\nCc: Christoph Raisch \u003craisch@de.ibm.com\u003e\nCc: Roland Dreier \u003croland@kernel.org\u003e\nCc: Sean Hefty \u003csean.hefty@intel.com\u003e\nCc: Hal Rosenstock \u003chal.rosenstock@gmail.com\u003e\nCc: linux390@de.ibm.com\nCc: Anton Altaparmakov \u003canton@tuxera.com\u003e\nCc: Jaroslav Kysela \u003cperex@perex.cz\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: lm-sensors@lm-sensors.org\nCc: linux-rdma@vger.kernel.org\nCc: linux-s390@vger.kernel.org\nCc: linux-ntfs-dev@lists.sourceforge.net\nCc: alsa-devel@alsa-project.org\nAcked-by: Takashi Iwai \u003ctiwai@suse.de\u003e (For the sound part)\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e (For the hwmon driver)\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "cca3e707301862ca9b9327e6a732463982f8cd1b", "tree": "5cc4767c5167e430209bcea7e43400a9f2e471ab", "parents": [ "8487bfd954928660a52e91384a9b1f1049217e35" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Fri Jan 13 09:32:15 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:15 2012 +1030" }, "message": "modules: sysfs - export: taint, coresize, initsize\n\nRecent tools do not want to use /proc to retrieve module information. A few\nvalues are currently missing from sysfs to replace the information available\nin /proc/modules.\n\nThis adds /sys/module/*/{coresize,initsize,taint} attributes.\n\nTAINT_PROPRIETARY_MODULE (P) and TAINT_OOT_MODULE (O) flags are both always\nshown now, and do no longer exclude each other, also in /proc/modules.\n\nReplace the open-coded sysfs attribute initializers with the __ATTR() macro.\n\nAdd the new attributes to Documentation/ABI.\n\nCc: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "8487bfd954928660a52e91384a9b1f1049217e35", "tree": "d6ef4215f934ace1ab8470f260a06d04bac619b7", "parents": [ "5e12416927975aa3c58394cea15db6c3e488a033" ], "author": { "name": "Jim Cromie", "email": "jim.cromie@gmail.com", "time": "Tue Dec 06 12:11:31 2011 -0700" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:15 2012 +1030" }, "message": "kernel/params: replace DEBUGP with pr_debug\n\nUse more flexible pr_debug. This allows:\n\n echo \"module params +p\" \u003e /dbg/dynamic_debug/control\n\nto turn on debug messages when needed.\n\nSigned-off-by: Jim Cromie \u003cjim.cromie@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "5e12416927975aa3c58394cea15db6c3e488a033", "tree": "267635bb138364dcb8f30de00c2d5f21dc5bcf63", "parents": [ "bd77c04772da38fca510c81f78e51f727123b919" ], "author": { "name": "Jim Cromie", "email": "jim.cromie@gmail.com", "time": "Tue Dec 06 12:11:31 2011 -0700" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:15 2012 +1030" }, "message": "module: replace DEBUGP with pr_debug\n\nUse more flexible pr_debug. This allows:\n\n echo \"module module +p\" \u003e /dbg/dynamic_debug/control\n\nto turn on debug messages when needed.\n\nSigned-off-by: Jim Cromie \u003cjim.cromie@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bd77c04772da38fca510c81f78e51f727123b919", "tree": "8554b40191d3d5adebbd2461d26450c0ed7295d4", "parents": [ "48fd11880b5ef04270be8a87d9a9a9ee2fdae338" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jan 13 09:32:14 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:14 2012 +1030" }, "message": "module: struct module_ref should contains long fields\n\nmodule_ref contains two \"unsigned int\" fields.\n\nThats now too small, since some machines can open more than 2^32 files.\n\nCheck commit 518de9b39e8 (fs: allow for more than 2^31 files) for\nreference.\n\nWe can add an aligned(2 * sizeof(unsigned long)) attribute to force\nalloc_percpu() allocating module_ref areas in single cache lines.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Robin Holt \u003cholt@sgi.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "48fd11880b5ef04270be8a87d9a9a9ee2fdae338", "tree": "1dc62486665f1d28e74a0e12fec5f01beb233313", "parents": [ "70b1e9161e903a9e1682aca3a832ed29ef876a4d" ], "author": { "name": "Kevin Cernekee", "email": "cernekee@gmail.com", "time": "Fri Jan 13 09:32:14 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:14 2012 +1030" }, "message": "module: Fix performance regression on modules with large symbol tables\n\nLooking at /proc/kallsyms, one starts to ponder whether all of the extra\nstrtab-related complexity in module.c is worth the memory savings.\n\nInstead of making the add_kallsyms() loop even more complex, I tried the\nother route of deleting the strmap logic and naively copying each string\ninto core_strtab with no consideration for consolidating duplicates.\n\nPerformance on an \"already exists\" insmod of nvidia.ko (runs\nadd_kallsyms() but does not actually initialize the module):\n\n\tOriginal scheme: 1.230s\n\tWith naive copying: 0.058s\n\nExtra space used: 35k (of a 408k module).\n\nSigned-off-by: Kevin Cernekee \u003ccernekee@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nLKML-Reference: \u003c73defb5e4bca04a6431392cc341112b1@localhost\u003e\n" }, { "commit": "70b1e9161e903a9e1682aca3a832ed29ef876a4d", "tree": "5b391043858bf70d5541b036504c80c5577be8fc", "parents": [ "2485a4b610171f4e1c4ab0d053569747795c1bbe" ], "author": { "name": "Kevin Cernekee", "email": "cernekee@gmail.com", "time": "Sat Nov 12 19:08:55 2011 -0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:13 2012 +1030" }, "message": "module: Add comments describing how the \"strmap\" logic works\n\nSigned-off-by: Kevin Cernekee \u003ccernekee@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "b8bf17d311c875de02550d5ce2af66588734159a", "tree": "82d829df77f3eb506d10928fd633a8a6e5685082", "parents": [ "9fc5c3e3237e02a94f41cd1d2b4291593d29791d", "bced76aeaca03b45e3b4bdb868cada328e497847" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 22:52:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 22:52:48 2012 -0800" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched: Fix lockup by limiting load-balance retries on lock-break\n sched: Fix CONFIG_CGROUP_SCHED dependency\n sched: Remove empty #ifdefs\n" }, { "commit": "541048a1d31399ccdda27346a37eae4a2ad55186", "tree": "e2a820ee478b18d4214347631b94b9a9b2d8562b", "parents": [ "bcede2f64a3b5cb50c0bdec1553ab480fd75d659", "e58d429209105e698e9d0357481d62b37fe9a7dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:04 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 19:13:04 2012 -0800" }, "message": "Merge branch \u0027x86-debug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-debug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, reboot: Fix typo in nmi reboot path\n x86, NMI: Add to_cpumask() to silence compile warning\n x86, NMI: NMI selftest depends on the local apic\n x86: Add stack top margin for stack overflow checking\n x86, NMI: NMI-selftest should handle the UP case properly\n x86: Fix the 32-bit stackoverflow-debug build\n x86, NMI: Add knob to disable using NMI IPIs to stop cpus\n x86, NMI: Add NMI IPI selftest\n x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus\n x86: Clean up the range of stack overflow checking\n x86: Panic on detection of stack overflow\n x86: Check stack overflow in detail\n" }, { "commit": "bced76aeaca03b45e3b4bdb868cada328e497847", "tree": "e2965b6cfecdc257a01b89ec6780b8de3b2e6d39", "parents": [ "6db9dc150eabce7053c8df2a2146aa0d6748ec42" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Jan 11 13:11:12 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 11 17:15:12 2012 +0100" }, "message": "sched: Fix lockup by limiting load-balance retries on lock-break\n\nEric and David reported dead machines and traced it to commit\na195f004 (\"sched: Fix load-balance lock-breaking\"), it turns out\nthere\u0027s still a scenario where we can end up re-trying forever.\n\nSince there is no strict forward progress guarantee in the\nload-balance iteration we can get stuck re-retrying the same\ntask-set over and over.\n\nCreating a forward progress guarantee with the existing\nstructure is somewhat non-trivial, for now simply terminate the\nretry loop after a few tries.\n\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nReported-by: David Ahern \u003cdsahern@gmail.com\u003e\n[ logic cleanup as suggested by Eric ]\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/1326297936.2442.157.camel@twins\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "001a541ea9163ace5e8243ee0e907ad80a4c0ec2", "tree": "a76225046369c440de93739add9823f5ea060245", "parents": [ "40ba587923ae67090d9f141c1d3c951be5c1420e", "bc31b86a5923fad5f3fbb6192f767f410241ba27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:59:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:59:59 2012 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: move MIN_WRITEBACK_PAGES to fs-writeback.c\n writeback: balanced_rate cannot exceed write bandwidth\n writeback: do strict bdi dirty_exceeded\n writeback: avoid tiny dirty poll intervals\n writeback: max, min and target dirty pause time\n writeback: dirty ratelimit - think time compensation\n btrfs: fix dirtied pages accounting on sub-page writes\n writeback: fix dirtied pages accounting on redirty\n writeback: fix dirtied pages accounting on sub-page writes\n writeback: charge leaked page dirties to active tasks\n writeback: Include all dirty inodes in background writeback\n" }, { "commit": "40ba587923ae67090d9f141c1d3c951be5c1420e", "tree": "342a72fc0ee13a0d2496ef970b64dfeadf1355d2", "parents": [ "54c2c5761febcca46c8037d3a81612991e6c209a", "6b550f9495947fc279d12c38feaf98500e8d0646" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:42:48 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb\")\n\nAndrew elucidates:\n - First installmeant of MM. We have a HUGE number of MM patches this\n time. It\u0027s crazy.\n - MAINTAINERS updates\n - backlight updates\n - leds\n - checkpatch updates\n - misc ELF stuff\n - rtc updates\n - reiserfs\n - procfs\n - some misc other bits\n\n* akpm: (124 commits)\n user namespace: make signal.c respect user namespaces\n workqueue: make alloc_workqueue() take printf fmt and args for name\n procfs: add hidepid\u003d and gid\u003d mount options\n procfs: parse mount options\n procfs: introduce the /proc/\u003cpid\u003e/map_files/ directory\n procfs: make proc_get_link to use dentry instead of inode\n signal: add block_sigmask() for adding sigmask to current-\u003eblocked\n sparc: make SA_NOMASK a synonym of SA_NODEFER\n reiserfs: don\u0027t lock root inode searching\n reiserfs: don\u0027t lock journal_init()\n reiserfs: delay reiserfs lock until journal initialization\n reiserfs: delete comments referring to the BKL\n drivers/rtc/interface.c: fix alarm rollover when day or month is out-of-range\n drivers/rtc/rtc-twl.c: add DT support for RTC inside twl4030/twl6030\n drivers/rtc/: remove redundant spi driver bus initialization\n drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static\n drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static\n rtc: convert drivers/rtc/* to use module_platform_driver()\n drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()\n drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler\n ...\n" }, { "commit": "6b550f9495947fc279d12c38feaf98500e8d0646", "tree": "ab018bd7e2f8c2c594252f35ffa7c413f86519cf", "parents": [ "b196be89cdc14a88cc637cdad845a75c5886c82d" ], "author": { "name": "Serge E. Hallyn", "email": "serge@hallyn.com", "time": "Tue Jan 10 15:11:37 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "user namespace: make signal.c respect user namespaces\n\nipc/mqueue.c: for __SI_MESQ, convert the uid being sent to recipient\u0027s\nuser namespace. (new, thanks Oleg)\n\n__send_signal: convert current\u0027s uid to the recipient\u0027s user namespace\nfor any siginfo which is not SI_FROMKERNEL (patch from Oleg, thanks\nagain :)\n\ndo_notify_parent and do_notify_parent_cldstop: map task\u0027s uid to parent\u0027s\nuser namespace\n\nptrace_signal maps parent\u0027s uid into current\u0027s user namespace before\nincluding in signal to current. IIUC Oleg has argued that this shouldn\u0027t\nmatter as the debugger will play with it, but it seems like not converting\nthe value currently being set is misleading.\n\nChangelog:\nSep 20: Inspired by Oleg\u0027s suggestion, define map_cred_ns() helper to\n\tsimplify callers and help make clear what we are translating\n (which uid into which namespace). Passing the target task would\n\tmake callers even easier to read, but we pass in user_ns because\n\tcurrent_user_ns() !\u003d task_cred_xxx(current, user_ns).\nSep 20: As recommended by Oleg, also put task_pid_vnr() under rcu_read_lock\n\tin ptrace_signal().\nSep 23: In send_signal(), detect when (user) signal is coming from an\n\tancestor or unrelated user namespace. Pass that on to __send_signal,\n\twhich sets si_uid to 0 or overflowuid if needed.\nOct 12: Base on Oleg\u0027s fixup_uid() patch. On top of that, handle all\n\tSI_FROMKERNEL cases at callers, because we can\u0027t assume sender is\n\tcurrent in those cases.\nNov 10: (mhelsley) rename fixup_uid to more meaningful usern_fixup_signal_uid\nNov 10: (akpm) make the !CONFIG_USER_NS case clearer\n\nSigned-off-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nFrom: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSubject: __send_signal: pass q-\u003einfo, not info, to userns_fixup_signal_uid (v2)\n\nEric Biederman pointed out that passing info is a bug and could lead to a\nNULL pointer deref to boot.\n\nA collection of signal, securebits, filecaps, cap_bounds, and a few other\nltp tests passed with this kernel.\n\nChangelog:\n Nov 18: previous patch missed a leading \u0027\u0026\u0027\n\nSigned-off-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nFrom: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSubject: ipc/mqueue: lock() \u003d\u003e unlock() typo\n\nThere was a double lock typo introduced in b085f4bd6b21 \"user namespace:\nmake signal.c respect user namespaces\"\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nAcked-by: Serge Hallyn \u003cserge@hallyn.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b196be89cdc14a88cc637cdad845a75c5886c82d", "tree": "195816e6ab82362969409b3317d223421502224a", "parents": [ "0499680a42141d86417a8fbaa8c8db806bea1201" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Jan 10 15:11:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "workqueue: make alloc_workqueue() take printf fmt and args for name\n\nalloc_workqueue() currently expects the passed in @name pointer to remain\naccessible. This is inconvenient and a bit silly given that the whole wq\nis being dynamically allocated. This patch updates alloc_workqueue() and\nfriends to take printf format string instead of opaque string and matching\nvarargs at the end. The name is allocated together with the wq and\nformatted.\n\nalloc_ordered_workqueue() is converted to a macro to unify varargs\nhandling with alloc_workqueue(), and, while at it, add comment to\nalloc_workqueue().\n\nNone of the current in-kernel users pass in string with \u0027%\u0027 as constant\nname and this change shouldn\u0027t cause any problem.\n\n[akpm@linux-foundation.org: use __printf]\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSuggested-by: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5e6292c0f28f03dfdb8ea3d685f0b838a23bfba4", "tree": "8684833680054ab48f9da2bbc36c93e3d00a3391", "parents": [ "f350b1778f1b7713ef54fbc7e079e09e2fe098b9" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Tue Jan 10 15:11:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "signal: add block_sigmask() for adding sigmask to current-\u003eblocked\n\nAbstract the code sequence for adding a signal handler\u0027s sa_mask to\ncurrent-\u003eblocked because the sequence is identical for all architectures.\nFurthermore, in the past some architectures actually got this code wrong,\nso introduce a wrapper that all architectures can use.\n\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "43d2b113241d6797b890318767e0af78e313414b", "tree": "6f25647f2660f8fca63cc8355b70ad643993dab8", "parents": [ "6bd4837de96e7d9f9bf33e59117c24fc230862ac" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Jan 10 15:08:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:44 2012 -0800" }, "message": "tracepoint: add tracepoints for debugging oom_score_adj\n\noom_score_adj is used for guarding processes from OOM-Killer. One of\nproblem is that it\u0027s inherited at fork(). When a daemon set oom_score_adj\nand make children, it\u0027s hard to know where the value is set.\n\nThis patch adds some tracepoints useful for debugging. This patch adds\n3 trace points.\n - creating new task\n - renaming a task (exec)\n - set oom_score_adj\n\nTo debug, users need to enable some trace pointer. Maybe filtering is useful as\n\n# EVENT\u003d/sys/kernel/debug/tracing/events/task/\n# echo \"oom_score_adj !\u003d 0\" \u003e $EVENT/task_newtask/filter\n# echo \"oom_score_adj !\u003d 0\" \u003e $EVENT/task_rename/filter\n# echo 1 \u003e $EVENT/enable\n# EVENT\u003d/sys/kernel/debug/tracing/events/oom/\n# echo 1 \u003e $EVENT/enable\n\noutput will be like this.\n# grep oom /sys/kernel/debug/tracing/trace\nbash-7699 [007] d..3 5140.744510: oom_score_adj_update: pid\u003d7699 comm\u003dbash oom_score_adj\u003d-1000\nbash-7699 [007] ...1 5151.818022: task_newtask: pid\u003d7729 comm\u003dbash clone_flags\u003d1200011 oom_score_adj\u003d-1000\nls-7729 [003] ...2 5151.818504: task_rename: pid\u003d7729 oldcomm\u003dbash newcomm\u003dls oom_score_adj\u003d-1000\nbash-7699 [002] ...1 5175.701468: task_newtask: pid\u003d7730 comm\u003dbash clone_flags\u003d1200011 oom_score_adj\u003d-1000\ngrep-7730 [007] ...2 5175.701993: task_rename: pid\u003d7730 oldcomm\u003dbash newcomm\u003dgrep oom_score_adj\u003d-1000\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c6968e73b90c2a2fb9a32d4bad249f8f70f70125", "tree": "67ec90fc8e187fcf316298dd9d514bbbbbc8f187", "parents": [ "c0a32fc5a2e470d0b02597b23ad79a317735253e" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Tue Jan 10 15:07:31 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:42 2012 -0800" }, "message": "PM/Hibernate: do not count debug pages as savable\n\nWhen debugging with CONFIG_DEBUG_PAGEALLOC and debug_guardpage_minorder \u003e\n0, we have lot of free pages that are not marked so. Snapshot code\naccount them as savable, what cause hibernate memory preallocation\nfailure.\n\nIt is pretty hard to make hibernate allocation succeed with\ndebug_guardpage_minorder\u003d1. This change at least make it possible when\nsystem has relatively big amount of RAM.\n\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3dcf6c1b6b29f327ec24a1986aaa8eba399b463f", "tree": "51e8d0659aa3e4aa50ac94cf13051fef135bda19", "parents": [ "e4e11180dfa545233e5145919b75b7fac88638df", "da69dee073a27ee2d4e50c9b19e9faf8776857eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 09:57:11 2012 -0800" }, "message": "Merge branch \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.3\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (74 commits)\n KVM: PPC: Whitespace fix for kvm.h\n KVM: Fix whitespace in kvm_para.h\n KVM: PPC: annotate kvm_rma_init as __init\n KVM: x86 emulator: implement RDPMC (0F 33)\n KVM: x86 emulator: fix RDPMC privilege check\n KVM: Expose the architectural performance monitoring CPUID leaf\n KVM: VMX: Intercept RDPMC\n KVM: SVM: Intercept RDPMC\n KVM: Add generic RDPMC support\n KVM: Expose a version 2 architectural PMU to a guests\n KVM: Expose kvm_lapic_local_deliver()\n KVM: x86 emulator: Use opcode::execute for Group 9 instruction\n KVM: x86 emulator: Use opcode::execute for Group 4/5 instructions\n KVM: x86 emulator: Use opcode::execute for Group 1A instruction\n KVM: ensure that debugfs entries have been created\n KVM: drop bsp_vcpu pointer from kvm struct\n KVM: x86: Consolidate PIT legacy test\n KVM: x86: Do not rely on implicit inclusions\n KVM: Make KVM_INTEL depend on CPU_SUP_INTEL\n KVM: Use memdup_user instead of kmalloc/copy_from_user\n ...\n" }, { "commit": "9b9fb610f6800e0db46cccd8618dd7e609c9bb5a", "tree": "9cd1157b35c144fc274f1deb14a88a2da3c5ce05", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913" ], "author": { "name": "Hiroshi Shimamoto", "email": "h-shimamoto@ct.jp.nec.com", "time": "Tue Jan 10 09:24:05 2012 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 10 09:57:41 2012 +0100" }, "message": "sched: Remove empty #ifdefs\n\nSigned-off-by: Hiroshi Shimamoto \u003ch-shimamoto@ct.jp.nec.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/4F0B8525.8070901@ct.jp.nec.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "tree": "8f38957c01b18edddd44d49ecc3beeac08a20b4e", "parents": [ "ac69e0928054ff29a5049902fb477f9c7605c773", "0d19ea866562e46989412a0676412fa0983c9ce7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n cgroup: fix to allow mounting a hierarchy by name\n cgroup: move assignement out of condition in cgroup_attach_proc()\n cgroup: Remove task_lock() from cgroup_post_fork()\n cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n cgroup: remove redundant get/put of task struct\n cgroup: remove redundant get/put of old css_set from migrate\n cgroup: Remove unnecessary task_lock before fetching css_set on migration\n cgroup: Drop task_lock(parent) on cgroup_fork()\n cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n resource cgroups: remove bogus cast\n cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n cgroup, cpuset: don\u0027t use ss-\u003epre_attach()\n cgroup: don\u0027t use subsys-\u003ecan_attach_task() or -\u003eattach_task()\n cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n cgroup: improve old cgroup handling in cgroup_attach_proc()\n cgroup: always lock threadgroup during migration\n threadgroup: extend threadgroup_lock() to cover exit and exec\n threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n ...\n\nFix up conflict in kernel/cgroup.c due to commit e0197aae59e5: \"cgroups:\nfix a css_set not found bug in cgroup_attach_proc\" that already\nmentioned that the bug is fixed (differently) in Tejun\u0027s cgroup\npatchset. This one, in other words.\n" }, { "commit": "a0e86bd4252519321b0d102dc4ed90557aa7bee9", "tree": "13c3cb632dfb85ea6b9f5c20273d793a99b20f15", "parents": [ "7dd72f5189b257f927cc3b35d98643a5c392f5c3" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Jan 08 22:44:29 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:15:21 2012 -0800" }, "message": "audit: always follow va_copy() with va_end()\n\nA call to va_copy() should always be followed by a call to va_end() in\nthe same function. In kernel/autit.c::audit_log_vformat() this is not\nalways done. This patch makes sure va_end() is always called.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "636f0c70f2557e0819b50c74e31b4a027327015e", "tree": "3a259ef26659dac92782651440091b9f5ab1a7f7", "parents": [ "675eef66e3edcab8065533edfefbcbbacb9a30d3", "2e885057b7f75035f0b85e02f737891482815a81" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 08 12:31:24 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 08 12:31:24 2012 +0100" }, "message": "Merge branch \u0027tip/perf/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core\n" }, { "commit": "675eef66e3edcab8065533edfefbcbbacb9a30d3", "tree": "49648661263d7c3b7645df904b3dbb18723ff744", "parents": [ "03f70388c39cef5dfdc70ce5473ec31577a18e6b", "96de37b62ca525cd77d2e85aea1472846ee31c4d" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 08 09:51:24 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 08 09:51:24 2012 +0100" }, "message": "Merge branch \u0027tip/perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core\n" }, { "commit": "02550d61f49266930e674286379d3601006b2893", "tree": "2d30df688b7f428908028dd20e83b22bc799dee7", "parents": [ "2d51daaa615e4724f24e43fa01e705c40551080a", "c89810acbcf48c7004e912b2b4b862480b2d00e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\ndevicetree/next changes queued for v3.3 merge window\n\n* tag \u0027devicetree-for-linus-20120104\u0027 of git://git.secretlab.ca/git/linux-2.6:\n ARM: prom.h: Fix build error by removing unneeded header file\n irq: check domain hwirq range for DT translate\n dt: add empty of_get_node/of_put_node functions\n of/pdt: fix section mismatch warning\n i2c-designware: add OF binding support\n dt/i2c: Enumerate some of the known trivial i2c devices\n dt: reform for_each_property to for_each_property_of_node\n ARM/of: allow *machine_desc.dt_compat to be const\n of/base: Take NULL string into account for property with multiple strings\n OF/device-tree: Add some entries to vendor-prefixes.txt\n\nFix up trivial add-add conflicts in include/linux/of.h\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": "34c80b1d93e6e20ca9dea0baf583a5b5510d92d4", "tree": "7dcbf0a4e09464247e6992c8f44fcc872867bd3a", "parents": [ "a6322de67b58a00e3a783ad9c87c2a11b2d67b47" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 21:32:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:19:54 2012 -0500" }, "message": "vfs: switch -\u003eshow_options() to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d8c9584ea2a92879f471fd3a2be3af6c534fb035", "tree": "3541b9c6228f820bdc65e4875156eb27b1c91cb1", "parents": [ "ece2ccb668046610189d88d6aaf05aeb09c988a1" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 07 18:16:57 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:16:53 2012 -0500" }, "message": "vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ece2ccb668046610189d88d6aaf05aeb09c988a1", "tree": "a0349945f7537de2aca420b47ced23b6294f8b65", "parents": [ "d10577a8d86a0c735488d66d32289a6d66bcfa20", "a218d0fdc5f9004164ff151d274487f6799907d0", "ff01bb4832651c6d25ac509a06a10fcbd75c461c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:15:54 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:15:54 2012 -0500" }, "message": "Merge branches \u0027vfsmount-guts\u0027, \u0027umode_t\u0027 and \u0027partitions\u0027 into Z\n" }, { "commit": "770e1b035dcb6ec3f8ee69dda0815dd1e220a683", "tree": "e6d36abfdb053fbc722aea8d7e946d6d1b93c7e1", "parents": [ "d3d0b024348c040f0d6851e2e59fc961677d5169", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)\n ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h\n ARM: 7269/1: mach-sa1100: fix sched_clock breakage\n ARM: 7198/1: arm/imx6: add restart support for imx6q\n ARM: restart: remove the now empty arch_reset()\n ARM: restart: remove comments about adding code to arch_reset()\n ARM: restart: lpc32xx \u0026 u300: remove unnecessary printk\n ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook\n ARM: restart: w90x900: use new restart hook\n ARM: restart: Versatile Express: use new restart hook\n ARM: restart: versatile: use new restart hook\n ARM: restart: u300: use new restart hook\n ARM: restart: tegra: use new restart hook\n ARM: restart: spear: use new restart hook\n ARM: restart: shark: use new restart hook\n ARM: restart: sa1100: use new restart hook\n ARM: 7252/1: restart: S5PV210: use new restart hook\n ARM: 7251/1: restart: S5PC100: use new restart hook\n ARM: 7250/1: restart: S5P64X0: use new restart hook\n ARM: 7266/1: restart: S3C64XX: use new restart hook\n ARM: 7265/1: restart: S3C24XX: use new restart hook\n ...\n\nFix up trivial conflict in arch/arm/mm/init.c due to removal of\nmemblock_init() clashing with the movement of the sorting of the meminfo\narray.\n" }, { "commit": "376613e81ddc68f545fd5c87ffc3ad222b7abe5f", "tree": "e1cb1cd43d05f57e4584dd5f9ce3eb965d0ddff1", "parents": [ "0db49b72bce26341274b74fd968501489a361ae3", "0518469d0a32be1e6dd8850ff274d52d72cdb52d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:57:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:57:44 2012 -0800" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, tsc: Skip TSC synchronization checks for tsc\u003dreliable\n clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz\n clocksource: cris: Convert to clocksource_register_khz\n clocksource: xtensa: Convert to clocksource_register_hz/khz\n clocksource: um: Convert to clocksource_register_hz/khz\n clocksource: parisc: Convert to clocksource_register_hz/khz\n clocksource: m86k: Convert to clocksource_register_hz/khz\n time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver\n time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver\n time: x86: Remove CLOCK_TICK_RATE from mach_timer.h\n time: x86: Remove CLOCK_TICK_RATE from tsc code\n time: Fix spelling mistakes in new comments\n time: fix bogus comment in timekeeping_get_ns_raw\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "0db49b72bce26341274b74fd968501489a361ae3", "tree": "cdb076827aefb38d719d4c42f8ef291c36072fa8", "parents": [ "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "1ac9bc6943edf7d181b4b1cc734981350d4f6bae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:33:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:44:54 2012 -0800" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)\n sched/tracing: Add a new tracepoint for sleeptime\n sched: Disable scheduler warnings during oopses\n sched: Fix cgroup movement of waking process\n sched: Fix cgroup movement of newly created process\n sched: Fix cgroup movement of forking process\n sched: Remove cfs bandwidth period check in tg_set_cfs_period()\n sched: Fix load-balance lock-breaking\n sched: Replace all_pinned with a generic flags field\n sched: Only queue remote wakeups when crossing cache boundaries\n sched: Add missing rcu_dereference() around -\u003ereal_parent usage\n [S390] fix cputime overflow in uptime_proc_show\n [S390] cputime: add sparse checking and cleanup\n sched: Mark parent and real_parent as __rcu\n sched, nohz: Fix missing RCU read lock\n sched, nohz: Set the NOHZ_BALANCE_KICK flag for idle load balancer\n sched, nohz: Fix the idle cpu check in nohz_idle_balance\n sched: Use jump_labels for sched_feat\n sched/accounting: Fix parameter passing in task_group_account_field\n sched/accounting: Fix user/system tick double accounting\n sched/accounting: Re-use scheduler statistics for the root cgroup\n ...\n\nFix up conflicts in\n - arch/ia64/include/asm/cputime.h, include/asm-generic/cputime.h\n\tusecs_to_cputime64() vs the sparse cleanups\n - kernel/sched/fair.c, kernel/time/tick-sched.c\n\tscheduler changes in multiple branches\n" }, { "commit": "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "tree": "502a8f9499bc1b4cb3300d666dab2d01a1921224", "parents": [ "423d091dfe58d3109d84c408810a7cfa82f6f184", "9e183426bfb52bb44bf3c443d6587e4d02478603" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)\n perf kvm: Fix copy \u0026 paste error in description\n perf script: Kill script_spec__delete\n perf top: Fix a memory leak\n perf stat: Introduce get_ratio_color() helper\n perf session: Remove impossible condition check\n perf tools: Fix feature-bits rework fallout, remove unused variable\n perf script: Add generic perl handler to process events\n perf tools: Use for_each_set_bit() to iterate over feature flags\n perf tools: Unify handling of features when writing feature section\n perf report: Accept fifos as input file\n perf tools: Moving code in some files\n perf tools: Fix out-of-bound access to struct perf_session\n perf tools: Continue processing header on unknown features\n perf tools: Improve macros for struct feature_ops\n perf: builtin-record: Document and check that mmap_pages must be a power of two.\n perf: builtin-record: Provide advice if mmap\u0027ing fails with EPERM.\n perf tools: Fix truncated annotation\n perf script: look up thread using tid instead of pid\n perf tools: Look up thread names for system wide profiling\n perf tools: Fix comm for processes with named threads\n ...\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\n" }, { "commit": "1483b3823542c9721eddf09a077af1e02ac96b50", "tree": "390dcff4ddfb8634ad62c7fc9c3c9d0e802e9c1e", "parents": [ "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:01:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:01:59 2012 -0800" }, "message": "Merge branch \u0027core-printk-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-printk-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n printk, lockdep: Switch to tracked irq ops\n printk, lockdep: Remove superfluous preempt_disable()\n printk, lockdep: Disable lock debugging on zap_locks()\n" }, { "commit": "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "tree": "1ef38a6a3b39f7e539fff848975a5672acc21f44", "parents": [ "15f043a65f655eb8a3aeb831a85da66de520c80f", "45aa0663cc408617b79a2b53f0a5f50e94688a48" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "message": "Merge branch \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)\n memblock: Reimplement memblock allocation using reverse free area iterator\n memblock: Kill early_node_map[]\n score: Use HAVE_MEMBLOCK_NODE_MAP\n s390: Use HAVE_MEMBLOCK_NODE_MAP\n mips: Use HAVE_MEMBLOCK_NODE_MAP\n ia64: Use HAVE_MEMBLOCK_NODE_MAP\n SuperH: Use HAVE_MEMBLOCK_NODE_MAP\n sparc: Use HAVE_MEMBLOCK_NODE_MAP\n powerpc: Use HAVE_MEMBLOCK_NODE_MAP\n memblock: Implement memblock_add_node()\n memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users\n memblock: Track total size of regions automatically\n powerpc: Cleanup memblock usage\n memblock: Reimplement memblock_enforce_memory_limit() using __memblock_remove()\n memblock: Make memblock functions handle overflowing range @size\n memblock: Reimplement __memblock_remove() using memblock_isolate_range()\n memblock: Separate out memblock_isolate_range() from memblock_set_node()\n memblock: Kill memblock_init()\n memblock: Kill sentinel entries at the end of static region arrays\n memblock: Add __memblock_dump_all()\n ...\n" }, { "commit": "15f043a65f655eb8a3aeb831a85da66de520c80f", "tree": "00f5dbc80796a41ef60320a52faeb68aa5755830", "parents": [ "8c717b72dec32a50666175b62b41de24e4b39be7", "f07fdec50a13f134ea9608c8fb3f6408c58ef55e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:52 2012 -0800" }, "message": "Merge branch \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n lockdep/waitqueues: Add better annotation\n lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging\n lockdep: Print lock name in lockdep_init_error()\n init/main.c: Execute lockdep_init() as early as possible\n lockdep, kmemcheck: Annotate -\u003elock in lockdep_init_map()\n lockdep, rtmutex, bug: Show taint flags on error\n lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep\n lockdep: Always try to set -\u003eclass_cache in register_lock_class() lockdep_init_map()\n" }, { "commit": "8c717b72dec32a50666175b62b41de24e4b39be7", "tree": "e2b4335496cbddb5cded7b1bfd7579ee33f60505", "parents": [ "07d106d0a33d6063d2061305903deb02489eba20", "dc4218bd0fe499fce2896f88101ea42dac1f60fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "message": "Merge branch \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n timer: Use debugobjects to catch deletion of uninitialized timers\n timer: Setup uninitialized timer with a stub callback\n debugobjects: Extend to assert that an object is initialized\n debugobjects: Be smarter about static objects\n" }, { "commit": "fd778461524849afd035679030ae8e8873c72b81", "tree": "32a5849c1879413fce0307af304e372eaa8225b4", "parents": [ "69f594a38967f4540ce7a29b3fd214e68a8330bd" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 12:25:16 2012 -0500" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Thu Jan 05 18:53:01 2012 -0500" }, "message": "security: remove the security_netlink_recv hook as it is equivalent to capable()\n\nOnce upon a time netlink was not sync and we had to get the effective\ncapabilities from the skb that was being received. Today we instead get\nthe capabilities from the current task. This has rendered the entire\npurpose of the hook moot as it is now functionally equivalent to the\ncapable() call.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "69f594a38967f4540ce7a29b3fd214e68a8330bd", "tree": "dff25b5f5ef0736fb63b08729bec4ff57062c13f", "parents": [ "f1c84dae0ecc51aa35c81f19a0ebcd6c0921ddcb" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 12:25:15 2012 -0500" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Thu Jan 05 18:53:00 2012 -0500" }, "message": "ptrace: do not audit capability check when outputing /proc/pid/stat\n\nReading /proc/pid/stat of another process checks if one has ptrace permissions\non that process. If one does have permissions it outputs some data about the\nprocess which might have security and attack implications. If the current\ntask does not have ptrace permissions the read still works, but those fields\nare filled with inocuous (0) values. Since this check and a subsequent denial\nis not a violation of the security policy we should not audit such denials.\n\nThis can be quite useful to removing ptrace broadly across a system without\nflooding the logs when ps is run or something which harmlessly walks proc.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\n" } ], "next": "f1c84dae0ecc51aa35c81f19a0ebcd6c0921ddcb" }