)]}' { "log": [ { "commit": "89555916584792eebd83db674dacf9fcb20526c6", "tree": "7771bfc3fda3b6eae2d3ec43e16dc1cc37b573a2", "parents": [ "eab45486bdd22c81a26bfe97d08ce53afbee5470", "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Feb 01 09:50:45 2012 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Feb 01 09:50:45 2012 +0100" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "62aa2b537c6f5957afd98e29f96897419ed5ebab", "tree": "9a798ee19f7b628b4add5b2629e8d79186cdd790", "parents": [ "d3712b9dfcf44ca145cf87e7f4096fa2d923471a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 31 13:31:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 31 13:31:54 2012 -0800" }, "message": "Linux 3.3-rc2\n" }, { "commit": "d3712b9dfcf44ca145cf87e7f4096fa2d923471a", "tree": "d72aaaa845fb81c669093363a0a1cc6d9e96baf2", "parents": [ "c5d2bc11030568966f04a2af35bacf33d3e37af7", "f2933e86ad93a8d1287079d59e67afd6f4166a9d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 31 09:23:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 31 09:23:59 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/prasad-joshi/logfs_upstream\n\nThere are few important bug fixes for LogFS\n\n* tag \u0027for-linus\u0027 of git://github.com/prasad-joshi/logfs_upstream:\n Logfs: Allow NULL block_isbad() methods\n logfs: Grow inode in delete path\n logfs: Free areas before calling generic_shutdown_super()\n logfs: remove useless BUG_ON\n MAINTAINERS: Add Prasad Joshi in LogFS maintiners\n logfs: Propagate page parameter to __logfs_write_inode\n logfs: set superblock shutdown flag after generic sb shutdown\n logfs: take write mutex lock during fsync and sync\n logfs: Prevent memory corruption\n logfs: update page reference count for pined pages\n\nFix up conflict in fs/logfs/dev_mtd.c due to semantic change in what\n\"mtd-\u003eblock_isbad\" means in commit f2933e86ad93: \"Logfs: Allow NULL\nblock_isbad() methods\" clashing with the abstraction changes in the\ncommits 7086c19d0742: \"mtd: introduce mtd_block_isbad interface\" and\nd58b27ed58a3: \"logfs: do not use \u0027mtd-\u003eblock_isbad\u0027 directly\".\n\nThis resolution takes the semantics from commit f2933e86ad93, and just\nmakes mtd_block_isbad() return zero (false) if the \u0027block_isbad\u0027\nfunction is NULL. But that also means that now \"mtd_can_have_bb()\"\nalways returns 0.\n\nNow, \"mtd_block_markbad()\" will obviously return an error if the\nlow-level driver doesn\u0027t support bad blocks, so this is somewhat\nnon-symmetric, but it actually makes sense if a NULL \"block_isbad\"\nfunction is considered to mean \"I assume that all my blocks are always\ngood\".\n" }, { "commit": "c5d2bc11030568966f04a2af35bacf33d3e37af7", "tree": "3ecbdea56f5c46ad80dd0486a37e04de6a7cc95c", "parents": [ "8e2a2880a5c67988104b6f2d5fafac7b78687a9d", "ad77c3e1808f07fa70f707b1c92a683b7c7d3f85" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 17:08:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 17:08:40 2012 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F\n hwmon: (sht15) fix bad error code\n MAINTAINERS: Drop maintainer for MAX1668 hwmon driver\n MAINTAINERS: Add hwmon entries for Wolfson\n hwmon: (f71805f) Fix clamping of temperature limits\n" }, { "commit": "8e2a2880a5c67988104b6f2d5fafac7b78687a9d", "tree": "7a9a1263462461825b47ff5af02254fdd5c0cbbb", "parents": [ "27ba234c8dfe86c96675d4ef275d1d3c1f5f7053", "b9130b776ee481acbc27a7e56d98df75680de369" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 17:06:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 17:06:26 2012 -0800" }, "message": "Merge branch \u0027for-torvalds\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nHere are some fixes to the pin control system that has accumulated since\n-rc1. Mainly Tony Lindgren fixed the module load/unload logic and the\nrest are minor fixes and documentation.\n\n* \u0027for-torvalds\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:\n pinctrl: add checks for empty function names\n pinctrl: fix pinmux_hog_maps when ctrl_dev_name is not set\n pinctrl: fix some pinmux typos\n pinctrl: free debugfs entries when unloading a pinmux driver\n pinctrl: unbreak error messages\n Documentation/pinctrl: fix a few syntax errors in code examples\n pinctrl: fix pinconf_pins_show iteration\n" }, { "commit": "27ba234c8dfe86c96675d4ef275d1d3c1f5f7053", "tree": "9782cde6e3336e795f52fad2d2e17bcb0c2a8ccd", "parents": [ "6bc2b95ee602659c1be6fac0f6aadeb0c5c29a5d", "523b82e3734908fc9eff5d48de46c83e76e51641" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 15:17:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 15:17:21 2012 -0800" }, "message": "Merge tag \u0027tty-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nHere are some tty/serial patches for 3.3-rc1\n\nBig thing here is the movement of the 8250 serial drivers to their own\ndirectory, now that the patch churn has calmed down.\n\nOther than that, only minor stuff (omap patches were reverted as they\nwere found to be wrong), and another broken driver removed from the\nsystem.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n* tag \u0027tty-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n serial: Kill off Moorestown code\n Revert \"tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode\"\n Revert \"tty: serial: OMAP: transmit FIFO threshold interrupts don\u0027t wake the chip\"\n serial: Fix wakeup init logic to speed up startup\n docbook: don\u0027t use serial_core.h in device-drivers book\n serial: amba-pl011: lock console writes against interrupts\n amba-pl011: do not disable RTS during shutdown\n tty: serial: OMAP: transmit FIFO threshold interrupts don\u0027t wake the chip\n tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode\n omap-serial: make serial_omap_restore_context depend on CONFIG_PM_RUNTIME\n omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP.\n TTY: fix UV serial console regression\n jsm: Fixed EEH recovery error\n Updated TTY MAINTAINERS info\n serial: group all the 8250 related code together\n" }, { "commit": "6bc2b95ee602659c1be6fac0f6aadeb0c5c29a5d", "tree": "2509d8e58233c7de6304ed8fd4c9e11b46dba00f", "parents": [ "a14a8d93169a8f2b0b000891571659ddbfa3a169", "a0701f04846eee9976e6b3eafca09f2a9d2744ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 11:38:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 11:38:28 2012 -0800" }, "message": "Merge tag \u0027usb-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nHere are a bunch of USB patches for 3.3-rc1.\n\nNothing major, largest thing here is the removal of some drivers that\ndid not work at all. Other than that, the normal collection of bugfixes\nand new device ids.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n* tag \u0027usb-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (52 commits)\n uwb \u0026 wusb: fix kconfig error\n USB: Realtek cr: fix autopm scheduling while atomic\n USB: ftdi_sio: Add more identifiers\n xHCI: Cleanup isoc transfer ring when TD length mismatch found\n usb: musb: omap2430: minor cleanups.\n qcaux: add more Pantech UML190 and UML290 ports\n Revert \"drivers: usb: Fix dependency for USB_HWA_HCD\"\n usb: mv-otg - Fix build if CONFIG_USB is not set\n USB: cdc-wdm: Avoid hanging on interface with no USB_CDC_DMM_TYPE\n usb: add support for STA2X11 host driver\n drivers: usb: Fix dependency for USB_HWA_HCD\n kernel-doc: fix new warning in usb.h\n USB: OHCI: fix new compiler warnings\n usb: serial: kobil_sct: fix compile warning:\n drivers/usb/host/ehci-fsl.c: add missing iounmap\n USB: cdc-wdm: better allocate a buffer that is at least as big as we tell the USB core\n USB: cdc-wdm: call wake_up_all to allow driver to shutdown on device removal\n USB: cdc-wdm: use two mutexes to allow simultaneous read and write\n USB: cdc-wdm: updating desc-\u003elength must be protected by spin_lock\n USB: usbsevseg: fix max length\n ...\n" }, { "commit": "a14a8d93169a8f2b0b000891571659ddbfa3a169", "tree": "36efa74c6f8c635079a8c3e057d25622282f4578", "parents": [ "b527a2331b873b8bf0549a45fc1ff635dd230d15", "6f01fd6e6f6809061b56e78f1e8d143099716d70" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 10:53:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 10:53:20 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n1) Setting link attributes can modify the size of the attributes that\n would be reported on a subsequent getlink netlink operation,\n therefore min_ifinfo_dump_size needs to be adjusted. From Stefan\n Gula.\n\n2) Resegmentation of TSO frames while trimming can violate invariants\n expected by callers, namely that the number of segments can only stay\n the same or decrease, never increase. If MSS changes, however, we\n can trim data but then end up with more segments. Fix this by only\n segmenting to the MSS already recorded in the SKB. That\u0027s the\n simplest fix for now and if we want to get more fancy in the future\n that\u0027s a more involved change.\n\n This probably explains some retransmit counter inaccuracies.\n\n From Neal Cardwell.\n\n3) Fix too-many-wakeups in POLL with AF_UNIX sockets, from Eric Dumazet.\n\n4) Fix CAIF crashes wrt. namespace handling. From Eric Dumazet and\n Eric W. Biederman.\n\n5) TCP port selection fixes from Flavio Leitner.\n\n6) More socket memory cgroup build fixes in certain randonfig\n situations. From Glauber Costa.\n\n7) Fix TCP memory sysctl regression reported by Ingo Molnar, also from\n Glauber Costa.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n af_unix: fix EPOLLET regression for stream sockets\n tcp: fix tcp_trim_head() to adjust segment count with skb MSS\n net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL\n net caif: Register properly as a pernet subsystem.\n netns: Fail conspicously if someone uses net_generic at an inappropriate time.\n net: explicitly add jump_label.h header to sock.h\n net: RTNETLINK adjusting values of min_ifinfo_dump_size\n ipv6: Fix ip_gre lockless xmits.\n xen-netfront: correct MAX_TX_TARGET calculation.\n netns: fix net_alloc_generic()\n tcp: bind() optimize port allocation\n tcp: bind() fix autoselection to share ports\n l2tp: l2tp_ip - fix possible oops on packet receive\n iwlwifi: fix PCI-E transport \"inta\" race\n mac80211: set bss_conf.idle when vif is connected\n mac80211: update oper_channel on ibss join\n" }, { "commit": "b527a2331b873b8bf0549a45fc1ff635dd230d15", "tree": "7d1ebe50287b702426c301d84d7c0d7f9342463a", "parents": [ "883120eb324a16aec6a9b0db651f0c0cfc02b89c", "8a093049c604ab32d94bcc5baa24f7939d5e3f7b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 10:16:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 10:16:25 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nThis fixes an integration issue with the regulator device tree bindings\nwhich shook out in -rc. The bindings were overly enthusiatic when\ndeciding to set a voltage on a regulator and would try to set zero volts\non an unconfigured regulator which isn\u0027t supported.\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: Set apply_uV only when min and max voltages are defined\n" }, { "commit": "6f01fd6e6f6809061b56e78f1e8d143099716d70", "tree": "bd6b09a01a5f1af65fc12c6ac533f2b1f4caa777", "parents": [ "5b35e1e6e9ca651e6b291c96d1106043c9af314a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Jan 28 16:11:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:45:07 2012 -0500" }, "message": "af_unix: fix EPOLLET regression for stream sockets\n\nCommit 0884d7aa24 (AF_UNIX: Fix poll blocking problem when reading from\na stream socket) added a regression for epoll() in Edge Triggered mode\n(EPOLLET)\n\nAppropriate fix is to use skb_peek()/skb_unlink() instead of\nskb_dequeue(), and only call skb_unlink() when skb is fully consumed.\n\nThis remove the need to requeue a partial skb into sk_receive_queue head\nand the extra sk-\u003esk_data_ready() calls that added the regression.\n\nThis is safe because once skb is given to sk_receive_queue, it is not\nmodified by a writer, and readers are serialized by u-\u003ereadlock mutex.\n\nThis also reduce number of spinlock acquisition for small reads or\nMSG_PEEK users so should improve overall performance.\n\nReported-by: Nick Mathewson \u003cnickm@freehaven.net\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Alexey Moiseytsev \u003chimeraster@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b35e1e6e9ca651e6b291c96d1106043c9af314a", "tree": "d18caadee5e93dc45d0c5fa2c530537cfa14586c", "parents": [ "4acb41903b2f99f3dffd4c3df9acc84ca5942cb2" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sat Jan 28 17:29:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:42:58 2012 -0500" }, "message": "tcp: fix tcp_trim_head() to adjust segment count with skb MSS\n\nThis commit fixes tcp_trim_head() to recalculate the number of\nsegments in the skb with the skb\u0027s existing MSS, so trimming the head\ncauses the skb segment count to be monotonically non-increasing - it\nshould stay the same or go down, but not increase.\n\nPreviously tcp_trim_head() used the current MSS of the connection. But\nif there was a decrease in MSS between original transmission and ACK\n(e.g. due to PMTUD), this could cause tcp_trim_head() to\ncounter-intuitively increase the segment count when trimming bytes off\nthe head of an skb. This violated assumptions in tcp_tso_acked() that\ntcp_trim_head() only decreases the packet count, so that packets_acked\nin tcp_tso_acked() could underflow, leading tcp_clean_rtx_queue() to\npass u32 pkts_acked values as large as 0xffffffff to\nca_ops-\u003epkts_acked().\n\nAs an aside, if tcp_trim_head() had really wanted the skb to reflect\nthe current MSS, it should have called tcp_set_skb_tso_segs()\nunconditionally, since a decrease in MSS would mean that a\nsingle-packet skb should now be sliced into multiple segments.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nAcked-by: Nandita Dukkipati \u003cnanditad@google.com\u003e\nAcked-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4acb41903b2f99f3dffd4c3df9acc84ca5942cb2", "tree": "3a2dc1739d654effecd86749e49a40d41019e645", "parents": [ "8a8ee9aff6c3077dd9c2c7a77478e8ed362b96c6" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Mon Jan 30 01:20:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:41:06 2012 -0500" }, "message": "net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL\n\nsysctl_tcp_mem() initialization was moved to sysctl_tcp_ipv4.c\nin commit 3dc43e3e4d0b52197d3205214fe8f162f9e0c334, since it\nbecame a per-ns value.\n\nThat code, however, will never run when CONFIG_SYSCTL is\ndisabled, leading to bogus values on those fields - causing hung\nTCP sockets.\n\nThis patch fixes it by keeping an initialization code in\ntcp_init(). It will be overwritten by the first net namespace\ninit if CONFIG_SYSCTL is compiled in, and do the right thing if\nit is compiled out.\n\nIt is also named properly as tcp_init_mem(), to properly signal\nits non-sysctl side effect on TCP limits.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nLink: http://lkml.kernel.org/r/4F22D05A.8030604@parallels.com\n[ renamed the function, tidied up the changelog a bit ]\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "883120eb324a16aec6a9b0db651f0c0cfc02b89c", "tree": "9476a585bcababa20be6f4ba284fde2ed5346240", "parents": [ "f07d4a76474045ac1b6d17662d2f6f041f5ce093", "f16330316321d1c388d13096f6858f5d2dac29dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 09:02:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 09:02:10 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:\n [S390] dasd: revalidate server for new pathgroup\n [S390] dasd: revert LCU optimization\n [S390] cleanup entry point definition\n" }, { "commit": "f07d4a76474045ac1b6d17662d2f6f041f5ce093", "tree": "0176e61c9b8b4851c6d71ff3776bb7a883d1a54f", "parents": [ "dfd07ec3fa42fb14c4e333747cb73903220c6e81", "eacb6ec9ae5932ea02a44268684a56e4b5996ccf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:59:46 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:59:46 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze\n\n* \u0027next\u0027 of git://git.monstr.eu/linux-2.6-microblaze:\n microblaze: generic atomic64 support\n" }, { "commit": "dfd07ec3fa42fb14c4e333747cb73903220c6e81", "tree": "b203b9d7382e154051bdc0058efc1ba0e05575de", "parents": [ "f94f72ee673edd6cd9cd36fd954173871808873f", "bf9c05d5b6d19b3e4c9fe21047694e94f48db89b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:56:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:56:41 2012 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n vmwgfx: Fix assignment in vmw_framebuffer_create_handle\n drm/radeon/kms: Fix device tree linkage of i2c buses\n drm: Pass the real error code back during GEM bo initialisation\n Revert \"drm/i810: cleanup reclaim_buffers\"\n" }, { "commit": "f94f72ee673edd6cd9cd36fd954173871808873f", "tree": "c0461aa50c44fb7d3869ca2a5e467447308f85e9", "parents": [ "a51f67a4b440896dfc170ff3ce35994771b1267f", "875ad3f8e7dff6bc1d053e5bfe73d8e8d2e6ae67" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:47:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:47:49 2012 -0800" }, "message": "Merge tag \u0027nfs-for-3.3-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nNFS client bugfixes for Linux 3.3 (pull 3)\n\n* tag \u0027nfs-for-3.3-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n SUNRPC: Fix machine creds in generic_create_cred and generic_match\n" }, { "commit": "a51f67a4b440896dfc170ff3ce35994771b1267f", "tree": "66e69f83b63e8517a47e0eb0e7ae730d8a9a109b", "parents": [ "0a9626575400879d1d5e6bc8768188b938d7c501", "181e9bdef37bfcaa41f3ab6c948a2a0d60a268b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:33:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:33:40 2012 -0800" }, "message": "Merge tag \u0027pm-fix-for-3.3-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPower management fix for 3.3-rc2\n\nFix for a hibernate (s2disk) regression introduced during the 3.2\nmerge window that causes s2disk to trigger BUG_ON() in\nfreeze_workqueues_begin() if there is not enough swap space to save\nthe image.\n\n* tag \u0027pm-fix-for-3.3-rc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Hibernate: Fix s2disk regression related to freezing workqueues\n" }, { "commit": "bf9c05d5b6d19b3e4c9fe21047694e94f48db89b", "tree": "0c5728cdd5ad4bcc8fb770a78d1521f1113f2d8a", "parents": [ "1ffd57c1da2a73b0a0e5cd7a6dd52cc49e36bef9" ], "author": { "name": "Ryan Mallon", "email": "rmallon@gmail.com", "time": "Sat Jan 28 08:51:40 2012 +1100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 30 09:32:39 2012 +0000" }, "message": "vmwgfx: Fix assignment in vmw_framebuffer_create_handle\n\nThe assignment of handle in vmw_framebuffer_create_handle doesn\u0027t actually do anything useful and is incorrectly assigning an integer value to a pointer argument. It appears that this is a typo and should be dereferencing handle rather than assigning to it directly. This fixes a bug where an undefined handle value is potentially returned to user-space.\n\nSigned-off-by: Ryan Mallon \u003crmallon@gmail.com\u003e\nReviewed-by: Jakob Bornecrantz\u003cjakob@vmware.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1ffd57c1da2a73b0a0e5cd7a6dd52cc49e36bef9", "tree": "4e986ab45ce4cc7a6b1ad763a70d761f2330b1b0", "parents": [ "dd8bc93d45c0ac4f64bf074d4be72418aac1609b" ], "author": { "name": "Jean Delvare", "email": "jdelvare@suse.de", "time": "Sat Jan 28 11:10:38 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 30 09:32:11 2012 +0000" }, "message": "drm/radeon/kms: Fix device tree linkage of i2c buses\n\nProperly set the parent device of i2c buses before registering them so\nthat they will show at the right place in the device tree (rather than\nin /sys/devices directly.)\n\nSigned-off-by: Jean Delvare \u003cjdelvare@suse.de\u003e\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dd8bc93d45c0ac4f64bf074d4be72418aac1609b", "tree": "79bc34bf0a99619b99a505642d39b38f354742e0", "parents": [ "6e877b576ddf7cde5db2e9a6dcb56fef0ea77e64" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 29 16:45:32 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 30 09:31:42 2012 +0000" }, "message": "drm: Pass the real error code back during GEM bo initialisation\n\nIn particular, I found I was hitting the max-file limit in the VFS,\nand the EFILE was being magically transformed into ENOMEM. Confusion\nreigns.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6e877b576ddf7cde5db2e9a6dcb56fef0ea77e64", "tree": "e00314c066c623ccb3ea44fad5a754ea7dc2dd2c", "parents": [ "0a9626575400879d1d5e6bc8768188b938d7c501" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Jan 29 17:05:52 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 30 09:31:25 2012 +0000" }, "message": "Revert \"drm/i810: cleanup reclaim_buffers\"\n\nThis reverts commit 87499ffdcb1c70f66988cd8febc4ead0ba2f9118.\n\nWhere is that paper bag ... ah here.\n\nI\u0027ve failed to take an odd interaction between my other cleanups and\nthis reclaim_buffers patch into account and also failed to properly\ntest it. Looks like there are more dragons and hidden trapdoors in the\ndrm release path than actual lines of code.\n\nUntil I get a clue, let\u0027s just revert this.\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ad77c3e1808f07fa70f707b1c92a683b7c7d3f85", "tree": "114fda730a4d3d03a89854a228a6927075335a6a", "parents": [ "6edf3c30af01854c416f8654d3d5d2652470afd4" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Fri Jan 27 17:56:06 2012 -0800" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Jan 29 13:06:07 2012 -0800" }, "message": "hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F\n\nNCT6776F only supports pwm mode for pwm2 and pwm3. Return error if an attempt\nis made to set those pwm channels to DC mode.\n\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: stable@vger.kernel.org # 3.0+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "181e9bdef37bfcaa41f3ab6c948a2a0d60a268b5", "tree": "66e69f83b63e8517a47e0eb0e7ae730d8a9a109b", "parents": [ "0a9626575400879d1d5e6bc8768188b938d7c501" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Jan 29 20:35:52 2012 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Jan 29 20:35:52 2012 +0100" }, "message": "PM / Hibernate: Fix s2disk regression related to freezing workqueues\n\nCommit 2aede851ddf08666f68ffc17be446420e9d2a056\n\n PM / Hibernate: Freeze kernel threads after preallocating memory\n\nintroduced a mechanism by which kernel threads were frozen after\nthe preallocation of hibernate image memory to avoid problems with\nfrozen kernel threads not responding to memory freeing requests.\nHowever, it overlooked the s2disk code path in which the\nSNAPSHOT_CREATE_IMAGE ioctl was run directly after SNAPSHOT_FREE,\nwhich caused freeze_workqueues_begin() to BUG(), because it saw\nthat worqueues had been already frozen.\n\nAlthough in principle this issue might be addressed by removing\nthe relevant BUG_ON() from freeze_workqueues_begin(), that would\nreintroduce the very problem that commit 2aede851ddf08666f68ffc17be4\nattempted to avoid into that particular code path. For this reason,\nto fix the issue at hand, introduce thaw_kernel_threads() and make\nthe SNAPSHOT_FREE ioctl execute it.\n\nSpecial thanks to Srivatsa S. Bhat for detailed analysis of the\nproblem.\n\nReported-and-tested-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "6edf3c30af01854c416f8654d3d5d2652470afd4", "tree": "744b870d3be8cd6bb97c200385b08748422862cb", "parents": [ "cba9384b3c53d1a302206f68134a6cbfbae1d686" ], "author": { "name": "Vivien Didelot", "email": "vivien.didelot@savoirfairelinux.com", "time": "Thu Jan 26 15:59:00 2012 -0500" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sun Jan 29 10:35:21 2012 -0800" }, "message": "hwmon: (sht15) fix bad error code\n\nWhen no platform data was supplied, returned error code was 0.\n\nSigned-off-by: Vivien Didelot \u003cvivien.didelot@savoirfairelinux.com\u003e\nCc: stable@vger.kernel.org # 2.6.32+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "0a9626575400879d1d5e6bc8768188b938d7c501", "tree": "131242645033de27d549d9cb5d97f0043914b6d2", "parents": [ "e3b8369ca8f2fd756031dd972224bc70c2364ec2", "ce597919361dcec97341151690e780eade2a9cf4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:20:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:20:48 2012 -0800" }, "message": "Merge tag \u0027driver-core-3.3-rc1-bugfixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nHere are some patches for the 3.3-rc1 tree.\n\nIt contains the removal of the sysdev code, now that all users of it are\ngone, as well as some sysfs bugfixes that have been reported by users.\nThere are also some documentation updates here as well.\n\n* tag \u0027driver-core-3.3-rc1-bugfixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n sysfs: Complain bitterly about attempts to remove files from nonexistent directories.\n stable: update documentation to ask for kernel version\n base/core.c:fix typo in comment in function device_add\n Documentation: devres: add allocation functions to list of supported calls\n Documentation update for the driver model core\n kernel-doc: fix new warnings in driver-core\n kernel-doc: fix new warnings in debugfs\n kernel-doc: fix new warnings in device.h\n driver core: remove drivers/base/sys.c and include/linux/sysdev.h\n" }, { "commit": "e3b8369ca8f2fd756031dd972224bc70c2364ec2", "tree": "bd4bab77912008a9f112b487616e08a74682f59b", "parents": [ "6c334f4f6aeb0916bfc15ff731073e9f24de0189", "13289d5f2b2ee73583e6c65c46a1e0cd48c3ddc0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:16:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:16:09 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n lguest: remove reference from Documentation/virtual/00-INDEX\n virtio: correct the memory barrier in virtqueue_kick_prepare()\n virtio: fix typos of memory barriers\n" }, { "commit": "6c334f4f6aeb0916bfc15ff731073e9f24de0189", "tree": "6e3140bdca215b1b5a74a8856458e753186979fb", "parents": [ "67d2433ee7aa631bc3ab14c2af6bbc1d44d13a00", "69e8f430e243d657c2053f097efebc2e2cd559f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:15:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 18:15:33 2012 -0800" }, "message": "Merge branch \u0027stable/for-linus-fixes-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/for-linus-fixes-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen/granttable: Disable grant v2 for HVM domains.\n x86: xen: size struct xen_spinlock to always fit in arch_spinlock_t\n" }, { "commit": "67d2433ee7aa631bc3ab14c2af6bbc1d44d13a00", "tree": "eb29e1489f9f4a99308e08568328de73fb89fc2e", "parents": [ "1c36ab1a318ab5b3b502e7e4fff3628d1a97861f", "9998eb703490589c3e8f1bf09b15203156776edb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 17:00:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 17:00:19 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:\n Btrfs: fix reservations in btrfs_page_mkwrite\n Btrfs: advance window_start if we\u0027re using a bitmap\n btrfs: mask out gfp flags in releasepage\n Btrfs: fix enospc error caused by wrong checks of the chunk\n Btrfs: do not defrag a file partially\n Btrfs: fix warning for 32-bit build of fs/btrfs/check-integrity.c\n Btrfs: use cluster-\u003ewindow_start when allocating from a cluster bitmap\n Btrfs: Check for NULL page in extent_range_uptodate\n btrfs: Fix busyloops in transaction waiting code\n Btrfs: make sure a bitmap has enough bytes\n Btrfs: fix uninit warning in backref.c\n" }, { "commit": "1c36ab1a318ab5b3b502e7e4fff3628d1a97861f", "tree": "a892fd40c1e19cf0f6efe89e3106113ca7759c29", "parents": [ "deb9b4ce97cbbf61a150f317badbeb7531aab276", "84e83c2846ffb42772056a0f825d8578dc92d586" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 16:57:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 16:57:15 2012 -0800" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\n* git://www.linux-watchdog.org/linux-watchdog:\n watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs\n watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev\n watchdog: Fix typo \"unexpectdly\"\n watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options\n watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options\n watchdog: Return proper error in nuc900wdt_probe if misc_register fails\n watchdog: Staticise nuc900_wdt\n watchdog: via_wdt: Staticise wdt_pci_table\n watchdog: omap_wdt.c: Fix the mismatch of pm_runtime enable and disable\n watchdog: dw_wdt.c: use devm_request_and_ioremap\n watchdog: imx2_wdt.c: use devm_request_and_ioremap\n" }, { "commit": "deb9b4ce97cbbf61a150f317badbeb7531aab276", "tree": "c296cb097c801ef64ee182a59978d3e541e700e8", "parents": [ "81bc3009e061cfd0e62e03a6761cce39c750b65e", "3c424f359898aff48c3d5bed608ac706f8a528c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 13:27:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 13:27:10 2012 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm: (31 commits)\n ARM: 7304/1: ioremap: fix boundary check when reusing static mapping\n ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts\n ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2\n ARM: 7298/1: realview: fix mapping of MPCore private memory region\n PCMCIA: fix sa1111 oops on remove\n ARM: 7288/1: mach-sa1100: add missing module_init() call\n ARM: 7297/1: smp_twd: make sure timer is stopped before registering it\n ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards\n ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block\n ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP\n ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs\n ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary\n ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes\n MFD: ucb1x00-ts: fix resume failure\n MFD: ucb1x00-core: fix gpiolib direction_output handling\n MFD: ucb1x00-core: fix missing restore of io output data on resume\n MFD: mcp-core: fix mcp_priv() to be more type safe\n MFD: mcp-core: fix complaints from the genirq layer\n Revert \"ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus.\"\n Revert \"ARM: sa1100: Refactor mcp-sa11x0 to use platform resources.\"\n ...\n\nFix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into\nmach-imx5 (commit 784a90c0a7d8: \"ARM i.MX: Merge i.MX5 support into\nmach-imx\"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by\nthe CPU_V7 logic from it in the old location in rmk\u0027s branch (commit\na092f2b15399: \"ARM: 7291/1: cache: assume 64-byte L1 cachelines for\nARMv7 CPUs\").\n" }, { "commit": "81bc3009e061cfd0e62e03a6761cce39c750b65e", "tree": "46dffbe307d4275dbcf1da1bf7c01dd06e09bac3", "parents": [ "acb42a3b611d7ad4cb173c3b37674b549df2ffeb", "5e9638643132795e6168bb483e883b6a9678e7b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 13:21:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 28 13:21:54 2012 -0800" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\narm-soc fixes for 3.3-rc:\n\nAT91 needed reset fixes which resulted in some minor code refactoring,\nit also adds a feature-removal for one of their platforms for 3.4.\nThe USB patches have been acked by Greg K-H.\n\ni.MX and ux500 both have some minor fixes, nothing controversial.\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap\n ARM: imx: iomux-v1.h: Fix build error due to __init annotation\n ARM: at91: Fix at91sam9g45 and at91cap9 reset\n ARM: at91: make rstc soc independent\n ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset\n ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h\n ARM: at91: fix cap9 ddrsdr register\n ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low\n USB: at91: fix clk_get error handling\n ARM: at91: removal of CAP9 SoC family\n ARM: at91: fix at91rm9200 soc subtype handling\n mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball\n mach-ux500: enable ARM errata 764369\n mach-ux500: do not override outer.inv_all\n mach-ux500: musb: now musb is always in OTG mode\n ARM: imx6: add missing twd_clk for imx6q clock\n" }, { "commit": "f2933e86ad93a8d1287079d59e67afd6f4166a9d", "tree": "43aa0955e24127ca0e54546defa0e321365e35dc", "parents": [ "bbe01387129f76fa4bec17904eb14c4bdc3c179f" ], "author": { "name": "Joern Engel", "email": "joern@logfs.org", "time": "Fri Aug 05 11:09:55 2011 +0200" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:43:40 2012 +0530" }, "message": "Logfs: Allow NULL block_isbad() methods\n\nNot all mtd drivers define block_isbad(). Let\u0027s assume no bad blocks\ninstead of refusing to mount.\n\nSigned-off-by: Joern Engel \u003cjoern@logfs.org\u003e\n" }, { "commit": "bbe01387129f76fa4bec17904eb14c4bdc3c179f", "tree": "7524e5c127da68f483221183ffb0ae841ebb1e6e", "parents": [ "1bcceaff8cbe5e5698ccf1015c9a938aa72718c4" ], "author": { "name": "Joern Engel", "email": "joern@logfs.org", "time": "Fri Aug 05 11:13:30 2011 +0200" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:43:07 2012 +0530" }, "message": "logfs: Grow inode in delete path\n\nCan be necessary if an inode gets deleted (through -ENOSPC) before being\nwritten. Might be better to move this into logfs_write_rec(), but for\nnow go with the stupid\u0026safe patch.\n\nSigned-off-by: Joern Engel \u003cjoern@logfs.org\u003e\n" }, { "commit": "1bcceaff8cbe5e5698ccf1015c9a938aa72718c4", "tree": "2e36c3d9d5577dbfd3998cab37576a8761cf18fa", "parents": [ "6c69494f6b442834f26377e02d43fc8e1272221d" ], "author": { "name": "Joern Engel", "email": "joern@logfs.org", "time": "Fri Aug 05 11:18:19 2011 +0200" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:42:39 2012 +0530" }, "message": "logfs: Free areas before calling generic_shutdown_super()\n\nOr hit an assertion in map_invalidatepage() instead.\n\nSigned-off-by: Joern Engel \u003cjoern@logfs.org\u003e\n" }, { "commit": "6c69494f6b442834f26377e02d43fc8e1272221d", "tree": "0f1f9973363d19fb5015ca25eb1c06a62fee22d6", "parents": [ "756ccb3c351e425ad5544ff1a92cfe6bec83b904" ], "author": { "name": "Joern Engel", "email": "joern@logfs.org", "time": "Mon Sep 12 21:09:16 2011 +0530" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:41:56 2012 +0530" }, "message": "logfs: remove useless BUG_ON\n\nIt prevents write sizes \u003e4k.\n\nSigned-off-by: Joern Engel \u003cjoern@logfs.org\u003e\n" }, { "commit": "756ccb3c351e425ad5544ff1a92cfe6bec83b904", "tree": "f217aadd7e1fa194bd544266dcc60fc3f02f4fdb", "parents": [ "0bd90387ed5a8abbcf43391b480efdc211721cfe" ], "author": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Tue Sep 13 23:04:11 2011 +0530" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:41:21 2012 +0530" }, "message": "MAINTAINERS: Add Prasad Joshi in LogFS maintiners\n\nAcked-by: Joern Engel \u003cjoern@logfs.org\u003e\nSigned-off-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\n" }, { "commit": "0bd90387ed5a8abbcf43391b480efdc211721cfe", "tree": "ce92c57f4a56b601a694a0d50e5b2834065f42c1", "parents": [ "ecfd890991a26e70547e025673580923a004c5e4" ], "author": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sun Oct 02 23:46:51 2011 +0530" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:38:25 2012 +0530" }, "message": "logfs: Propagate page parameter to __logfs_write_inode\n\nDuring GC LogFS has to rewrite each valid block to a separate segment.\nRewrite operation reads data from an old segment and writes it to a\nnewly allocated segment. Since every write operation changes data\nblock pointers maintained in inode, inode should also be rewritten.\n\nIn GC path to avoid AB-BA deadlock LogFS marks a page with\nPG_pre_locked in addition to locking the page (PG_locked). The page\nlock is ignored iff the page is pre-locked.\n\nLogFS uses a special file called segment file. The segment file\nmaintains an 8 bytes entry for every segment. It keeps track of erase\ncount, level etc. for every segment.\n\nBad things happen with a segment belonging to the segment file is GCed\n\n ------------[ cut here ]------------\nkernel BUG at /home/prasad/logfs/readwrite.c:297!\ninvalid opcode: 0000 [#1] SMP\nModules linked in: logfs joydev usbhid hid psmouse e1000 i2c_piix4\n\t\tserio_raw [last unloaded: logfs]\nPid: 20161, comm: mount Not tainted 3.1.0-rc3+ #3 innotek GmbH\n\t\tVirtualBox\nEIP: 0060:[\u003cf809132a\u003e] EFLAGS: 00010292 CPU: 0\nEIP is at logfs_lock_write_page+0x6a/0x70 [logfs]\nEAX: 00000027 EBX: f73f5b20 ECX: c16007c8 EDX: 00000094\nESI: 00000000 EDI: e59be6e4 EBP: c7337b28 ESP: c7337b18\nDS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nProcess mount (pid: 20161, ti\u003dc7336000 task\u003deb323f70 task.ti\u003dc7336000)\nStack:\nf8099a3d c7337b24 f73f5b20 00001002 c7337b50 f8091f6d f8099a4d f80994e4\n00000003 00000000 c7337b68 00000000 c67e4400 00001000 c7337b80 f80935e5\n00000000 00000000 00000000 00000000 e1fcf000 0000000f e59be618 c70bf900\nCall Trace:\n[\u003cf8091f6d\u003e] logfs_get_write_page.clone.16+0xdd/0x100 [logfs]\n[\u003cf80935e5\u003e] logfs_mod_segment_entry+0x55/0x110 [logfs]\n[\u003cf809460d\u003e] logfs_get_segment_entry+0x1d/0x20 [logfs]\n[\u003cf8091060\u003e] ? logfs_cleanup_journal+0x50/0x50 [logfs]\n[\u003cf809521b\u003e] ostore_get_erase_count+0x1b/0x40 [logfs]\n[\u003cf80965b8\u003e] logfs_open_area+0xc8/0x150 [logfs]\n[\u003cc141a7ec\u003e] ? kmemleak_alloc+0x2c/0x60\n[\u003cf809668e\u003e] __logfs_segment_write.clone.16+0x4e/0x1b0 [logfs]\n[\u003cc10dd563\u003e] ? mempool_kmalloc+0x13/0x20\n[\u003cc10dd563\u003e] ? mempool_kmalloc+0x13/0x20\n[\u003cf809696f\u003e] logfs_segment_write+0x17f/0x1d0 [logfs]\n[\u003cf8092e8c\u003e] logfs_write_i0+0x11c/0x180 [logfs]\n[\u003cf8092f35\u003e] logfs_write_direct+0x45/0x90 [logfs]\n[\u003cf80934cd\u003e] __logfs_write_buf+0xbd/0xf0 [logfs]\n[\u003cc102900e\u003e] ? kmap_atomic_prot+0x4e/0xe0\n[\u003cf809424b\u003e] logfs_write_buf+0x3b/0x60 [logfs]\n[\u003cf80947a9\u003e] __logfs_write_inode+0xa9/0x110 [logfs]\n[\u003cf8094cb0\u003e] logfs_rewrite_block+0xc0/0x110 [logfs]\n[\u003cf8095300\u003e] ? get_mapping_page+0x10/0x60 [logfs]\n[\u003cf8095aa0\u003e] ? logfs_load_object_aliases+0x2e0/0x2f0 [logfs]\n[\u003cf808e57d\u003e] logfs_gc_segment+0x2ad/0x310 [logfs]\n[\u003cf808e62a\u003e] __logfs_gc_once+0x4a/0x80 [logfs]\n[\u003cf808ed43\u003e] logfs_gc_pass+0x683/0x6a0 [logfs]\n[\u003cf8097a89\u003e] logfs_mount+0x5a9/0x680 [logfs]\n[\u003cc1126b21\u003e] mount_fs+0x21/0xd0\n[\u003cc10f6f6f\u003e] ? __alloc_percpu+0xf/0x20\n[\u003cc113da41\u003e] ? alloc_vfsmnt+0xb1/0x130\n[\u003cc113db4b\u003e] vfs_kern_mount+0x4b/0xa0\n[\u003cc113e06e\u003e] do_kern_mount+0x3e/0xe0\n[\u003cc113f60d\u003e] do_mount+0x34d/0x670\n[\u003cc10f2749\u003e] ? strndup_user+0x49/0x70\n[\u003cc113fcab\u003e] sys_mount+0x6b/0xa0\n[\u003cc142d87c\u003e] syscall_call+0x7/0xb\nCode: f8 e8 8b 93 39 c9 8b 45 f8 3e 0f ba 28 00 19 d2 85 d2 74 ca eb d0 0f 0b 8d 45 fc 89 44 24 04 c7 04 24 3d 9a 09 f8 e8 09 92 39 c9 \u003c0f\u003e 0b 8d 74 26 00 55 89 e5 3e 8d 74 26 00 8b 10 80 e6 01 74 09\nEIP: [\u003cf809132a\u003e] logfs_lock_write_page+0x6a/0x70 [logfs] SS:ESP 0068:c7337b18\n---[ end trace 96e67d5b3aa3d6ca ]---\n\nThe patch passes locked page to __logfs_write_inode. It calls function\nlogfs_get_wblocks() to pre-lock the page. This ensures any further\nattempts to lock the page are ignored (esp from get_erase_count).\n\nAcked-by: Joern Engel \u003cjoern@logfs.org\u003e\nSigned-off-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\n" }, { "commit": "ecfd890991a26e70547e025673580923a004c5e4", "tree": "f9f97f0cc7b858ff6602efce424bee1c1d1e9dc4", "parents": [ "13ced29cb28996a9bc4f68e43ff0c57eafdb1e21" ], "author": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sun Oct 30 22:15:32 2011 +0530" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:37:47 2012 +0530" }, "message": "logfs: set superblock shutdown flag after generic sb shutdown\n\nWhile unmounting the file system LogFS calls generic_shutdown_super.\nThe function does file system independent superblock shutdown.\nHowever, it might result in call file system specific inode eviction.\n\nLogFS marks FS shutting down by setting bit LOGFS_SB_FLAG_SHUTDOWN in\nsuper-\u003es_flags. Since, inode eviction might call truncate on inode,\nfollowing BUG is observed when file system is unmounted:\n\n------------[ cut here ]------------\nkernel BUG at /home/prasad/logfs/segment.c:362!\ninvalid opcode: 0000 [#1] PREEMPT SMP\nCPU 3\nModules linked in: logfs binfmt_misc ppdev virtio_blk parport_pc lp\n\tparport psmouse floppy virtio_pci serio_raw virtio_ring virtio\n\nPid: 1933, comm: umount Not tainted 3.0.0+ #4 Bochs Bochs\nRIP: 0010:[\u003cffffffffa008c841\u003e] [\u003cffffffffa008c841\u003e]\n\t\tlogfs_segment_write+0x211/0x230 [logfs]\nRSP: 0018:ffff880062d7b9e8 EFLAGS: 00010202\nRAX: 000000000000000e RBX: ffff88006eca9000 RCX: 0000000000000000\nRDX: ffff88006fd87c40 RSI: ffffea00014ff468 RDI: ffff88007b68e000\nRBP: ffff880062d7ba48 R08: 8000000020451430 R09: 0000000000000000\nR10: dead000000100100 R11: 0000000000000000 R12: ffff88006fd87c40\nR13: ffffea00014ff468 R14: ffff88005ad0a460 R15: 0000000000000000\nFS: 00007f25d50ea760(0000) GS:ffff88007fd80000(0000)\n\tknlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\nCR2: 0000000000d05e48 CR3: 0000000062c72000 CR4: 00000000000006e0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess umount (pid: 1933, threadinfo ffff880062d7a000,\n\ttask ffff880070b44500)\nStack:\nffff880062d7ba38 ffff88005ad0a508 0000000000001000 0000000000000000\n8000000020451430 ffffea00014ff468 ffff880062d7ba48 ffff88005ad0a460\nffff880062d7bad8 ffffea00014ff468 ffff88006fd87c40 0000000000000000\nCall Trace:\n[\u003cffffffffa0088fee\u003e] logfs_write_i0+0x12e/0x190 [logfs]\n[\u003cffffffffa0089360\u003e] __logfs_write_rec+0x140/0x220 [logfs]\n[\u003cffffffffa0089312\u003e] __logfs_write_rec+0xf2/0x220 [logfs]\n[\u003cffffffffa00894a4\u003e] logfs_write_rec+0x64/0xd0 [logfs]\n[\u003cffffffffa0089616\u003e] __logfs_write_buf+0x106/0x110 [logfs]\n[\u003cffffffffa008a19e\u003e] logfs_write_buf+0x4e/0x80 [logfs]\n[\u003cffffffffa008a6b8\u003e] __logfs_write_inode+0x98/0x110 [logfs]\n[\u003cffffffffa008a7c4\u003e] logfs_truncate+0x54/0x290 [logfs]\n[\u003cffffffffa008abfc\u003e] logfs_evict_inode+0xdc/0x190 [logfs]\n[\u003cffffffff8115eef5\u003e] evict+0x85/0x170\n[\u003cffffffff8115f126\u003e] iput+0xe6/0x1b0\n[\u003cffffffff8115b4a8\u003e] shrink_dcache_for_umount_subtree+0x218/0x280\n[\u003cffffffff8115ce91\u003e] shrink_dcache_for_umount+0x51/0x90\n[\u003cffffffff8114796c\u003e] generic_shutdown_super+0x2c/0x100\n[\u003cffffffffa008cc47\u003e] logfs_kill_sb+0x57/0xf0 [logfs]\n[\u003cffffffff81147de5\u003e] deactivate_locked_super+0x45/0x70\n[\u003cffffffff811487ea\u003e] deactivate_super+0x4a/0x70\n[\u003cffffffff81163934\u003e] mntput_no_expire+0xa4/0xf0\n[\u003cffffffff8116469f\u003e] sys_umount+0x6f/0x380\n[\u003cffffffff814dd46b\u003e] system_call_fastpath+0x16/0x1b\nCode: 55 c8 49 8d b6 a8 00 00 00 45 89 f9 45 89 e8 4c 89 e1 4c 89 55\nb8 c7 04 24 00 00 00 00 e8 68 fc ff ff 4c 8b 55 b8 e9 3c ff ff ff \u003c0f\u003e\n0b 0f 0b c7 45 c0 00 00 00 00 e9 44 fe ff ff 66 66 66 66 66\nRIP [\u003cffffffffa008c841\u003e] logfs_segment_write+0x211/0x230 [logfs]\nRSP \u003cffff880062d7b9e8\u003e\n---[ end trace fe6b040cea952290 ]---\n\nTherefore, move super-\u003es_flags setting after the fs-indenpendent work\nhas been finished.\n\nReviewed-by: Joern Engel \u003cjoern@logfs.org\u003e\nSigned-off-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\n" }, { "commit": "13ced29cb28996a9bc4f68e43ff0c57eafdb1e21", "tree": "7c5b11f5e5124fa4d0642281880b4c558b9e5fec", "parents": [ "934eed395d201bf0901ca0c0cc3703b18729d0ce" ], "author": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:36:06 2012 +0530" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:36:06 2012 +0530" }, "message": "logfs: take write mutex lock during fsync and sync\n\nLogFS uses super-\u003es_write_mutex while writing data to disk. Taking the\nsame mutex lock in sync and fsync code path solves the following BUG:\n\n------------[ cut here ]------------\nkernel BUG at /home/prasad/logfs/dev_bdev.c:134!\n\nPid: 2387, comm: flush-253:16 Not tainted 3.0.0+ #4 Bochs Bochs\nRIP: 0010:[\u003cffffffffa007deed\u003e] [\u003cffffffffa007deed\u003e]\n bdev_writeseg+0x25d/0x270 [logfs]\nCall Trace:\n[\u003cffffffffa007c381\u003e] logfs_open_area+0x91/0x150 [logfs]\n[\u003cffffffff8128dcb2\u003e] ? find_level.clone.9+0x62/0x100\n[\u003cffffffffa007c49c\u003e] __logfs_segment_write.clone.20+0x5c/0x190 [logfs]\n[\u003cffffffff810ef005\u003e] ? mempool_kmalloc+0x15/0x20\n[\u003cffffffff810ef383\u003e] ? mempool_alloc+0x53/0x130\n[\u003cffffffffa007c7a4\u003e] logfs_segment_write+0x1d4/0x230 [logfs]\n[\u003cffffffffa0078f8e\u003e] logfs_write_i0+0x12e/0x190 [logfs]\n[\u003cffffffffa0079300\u003e] __logfs_write_rec+0x140/0x220 [logfs]\n[\u003cffffffffa0079444\u003e] logfs_write_rec+0x64/0xd0 [logfs]\n[\u003cffffffffa00795b6\u003e] __logfs_write_buf+0x106/0x110 [logfs]\n[\u003cffffffffa007a13e\u003e] logfs_write_buf+0x4e/0x80 [logfs]\n[\u003cffffffffa0073e33\u003e] __logfs_writepage+0x23/0x80 [logfs]\n[\u003cffffffffa007410c\u003e] logfs_writepage+0xdc/0x110 [logfs]\n[\u003cffffffff810f5ba7\u003e] __writepage+0x17/0x40\n[\u003cffffffff810f6208\u003e] write_cache_pages+0x208/0x4f0\n[\u003cffffffff810f5b90\u003e] ? set_page_dirty+0x70/0x70\n[\u003cffffffff810f653a\u003e] generic_writepages+0x4a/0x70\n[\u003cffffffff810f75d1\u003e] do_writepages+0x21/0x40\n[\u003cffffffff8116b9d1\u003e] writeback_single_inode+0x101/0x250\n[\u003cffffffff8116bdbd\u003e] writeback_sb_inodes+0xed/0x1c0\n[\u003cffffffff8116c5fb\u003e] writeback_inodes_wb+0x7b/0x1e0\n[\u003cffffffff8116cc23\u003e] wb_writeback+0x4c3/0x530\n[\u003cffffffff814d984d\u003e] ? sub_preempt_count+0x9d/0xd0\n[\u003cffffffff8116cd6b\u003e] wb_do_writeback+0xdb/0x290\n[\u003cffffffff814d984d\u003e] ? sub_preempt_count+0x9d/0xd0\n[\u003cffffffff814d6208\u003e] ? _raw_spin_unlock_irqrestore+0x18/0x40\n[\u003cffffffff8105aa5a\u003e] ? del_timer+0x8a/0x120\n[\u003cffffffff8116cfac\u003e] bdi_writeback_thread+0x8c/0x2e0\n[\u003cffffffff8116cf20\u003e] ? wb_do_writeback+0x290/0x290\n[\u003cffffffff8106d2e6\u003e] kthread+0x96/0xa0\n[\u003cffffffff814de514\u003e] kernel_thread_helper+0x4/0x10\n[\u003cffffffff8106d250\u003e] ? kthread_worker_fn+0x190/0x190\n[\u003cffffffff814de510\u003e] ? gs_change+0xb/0xb\nRIP [\u003cffffffffa007deed\u003e] bdev_writeseg+0x25d/0x270 [logfs]\n---[ end trace 0211ad60a57657c4 ]---\n\nReviewed-by: Joern Engel \u003cjoern@logfs.org\u003e\nSigned-off-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\n" }, { "commit": "934eed395d201bf0901ca0c0cc3703b18729d0ce", "tree": "27847639b14a0fc16b850bd39c0ace939694d8f2", "parents": [ "96150606e2fb82d242c9e4a414e4e922849f7bf7" ], "author": { "name": "Joern Engel", "email": "joern@logfs.org", "time": "Sun Nov 20 22:29:01 2011 +0530" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:24:21 2012 +0530" }, "message": "logfs: Prevent memory corruption\n\nThis is a bad one. I wonder whether we were so far protected by\nno_free_segments(sb) usually being smaller than LOGFS_NO_AREAS.\n\nFound by Dan Carpenter \u003cdan.carpenter@oracle.com\u003e using smatch.\n\nSigned-off-by: Joern Engel \u003cjoern@logfs.org\u003e\nSigned-off-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\n" }, { "commit": "96150606e2fb82d242c9e4a414e4e922849f7bf7", "tree": "efdb8a85b5838aa13e6c233ebec580c1f956be5d", "parents": [ "f423fc627b05f47bc9305f9661630fce30f208f9" ], "author": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Nov 26 11:00:47 2011 +0530" }, "committer": { "name": "Prasad Joshi", "email": "prasadjoshi.linux@gmail.com", "time": "Sat Jan 28 11:23:10 2012 +0530" }, "message": "logfs: update page reference count for pined pages\n\nLogFS sets PG_private flag to indicate a pined page. We assumed that\nmarking a page as private is enough to ensure its existence. But\ninstead it is necessary to hold a reference count to the page.\n\nThe change resolves the following BUG\n\nBUG: Bad page state in process flush-253:16 pfn:6a6d0\npage flags: 0x100000000000808(uptodate|private)\n\nSuggested-and-Acked-by: Joern Engel \u003cjoern@logfs.org\u003e\nSigned-off-by: Prasad Joshi \u003cprasadjoshi.linux@gmail.com\u003e\n" }, { "commit": "8a8ee9aff6c3077dd9c2c7a77478e8ed362b96c6", "tree": "bb905513ac457b8e7204056a17345ad3a5888db6", "parents": [ "5ee4433efe99b9f39f6eff5052a177bbcfe72cea" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Jan 26 14:04:53 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 21:06:03 2012 -0500" }, "message": "net caif: Register properly as a pernet subsystem.\n\ncaif is a subsystem and as such it needs to register with\nregister_pernet_subsys instead of register_pernet_device.\n\nAmong other problems using register_pernet_device was resulting in\nnet_generic being called before the caif_net structure was allocated.\nWhich has been causing net_generic to fail with either BUG_ON\u0027s or by\nreturn NULL pointers.\n\nA more ugly problem that could be caused is packets in flight why the\nsubsystem is shutting down.\n\nTo remove confusion also remove the cruft cause by inappropriately\ntrying to fix this bug.\n\nWith the aid of the previous patch I have tested this patch and\nconfirmed that using register_pernet_subsys makes the failure go away as\nit should.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nTested-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ee4433efe99b9f39f6eff5052a177bbcfe72cea", "tree": "0be8ae9b59828b3fee0fdf5cac9432604a317230", "parents": [ "cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Jan 26 14:02:55 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 21:06:02 2012 -0500" }, "message": "netns: Fail conspicously if someone uses net_generic at an inappropriate time.\n\nBy definition net_generic should never be called when it can return\nNULL. Fail conspicously with a BUG_ON to make it clear when people mess\nup that a NULL return should never happen.\n\nRecently there was a bug in the CAIF subsystem where it was registered\nwith register_pernet_device instead of register_pernet_subsys. It was\nerroneously concluded that net_generic could validly return NULL and\nthat net_assign_generic was buggy (when it was just inefficient).\nHopefully this BUG_ON will prevent people to coming to similar erroneous\nconclusions in the futrue.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nTested-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419", "tree": "5f0e86afb61b33658ec42b37ae739809ec98cb3d", "parents": [ "9018e93948c6f8f95fbcc9fa05f6c403d6adb406", "b49ba04a3a0382e7314d990707c21094c410425a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 20:40:18 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 20:40:18 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "13289d5f2b2ee73583e6c65c46a1e0cd48c3ddc0", "tree": "4fd853a8d2d29e8c821236fac318293eed77a959", "parents": [ "a72caae21803b74e04e2afda5e035f149d4ea118" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Sat Jan 28 08:10:23 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Sat Jan 28 08:10:23 2012 +1030" }, "message": "lguest: remove reference from Documentation/virtual/00-INDEX\n\nWe\u0027re in tools/lguest now.\n\nReported-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a72caae21803b74e04e2afda5e035f149d4ea118", "tree": "680a59aa70e790a3735ae054be5888c0892ecb41", "parents": [ "4dbc5d9f4f791df8a5879f4a655f517adc7f56d1" ], "author": { "name": "Jason Wang", "email": "jasowang@redhat.com", "time": "Fri Jan 20 16:17:08 2012 +0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Sat Jan 28 08:10:23 2012 +1030" }, "message": "virtio: correct the memory barrier in virtqueue_kick_prepare()\n\nUse virtio_mb() to make sure the available index to be exposed before\nchecking the the avail event. Otherwise we may get stale value of\navail event in guest and never kick the host after.\n\nNote: this fixes a bug introduced by ee7cd8981e15bcb365fc762afe3fc47b8242f630.\n\nSigned-off-by: Jason Wang \u003cjasowang@redhat.com\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: stable@kernel.org\n" }, { "commit": "4dbc5d9f4f791df8a5879f4a655f517adc7f56d1", "tree": "19c8c31c0f1097887d6fcfea19c1ae30e5a2e5e5", "parents": [ "74ea15d909b31158f9b63190a95b52bc05586d4b" ], "author": { "name": "Jason Wang", "email": "jasowang@redhat.com", "time": "Fri Jan 20 16:16:59 2012 +0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Sat Jan 28 08:10:22 2012 +1030" }, "message": "virtio: fix typos of memory barriers\n\nNote: this fixes a bug introduced recently in\n7b21e34fd1c272e3a8c3846168f2f6287a4cd72b.\n\nSigned-off-by: Jason Wang \u003cjasowang@redhat.com\u003e\nAcked-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "3c424f359898aff48c3d5bed608ac706f8a528c3", "tree": "aeddc0dd01e9e9f5a690f90ddb1bfb7a588ea929", "parents": [ "9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf" ], "author": { "name": "Pawel Moll", "email": "pawel.moll@arm.com", "time": "Thu Jan 26 11:47:11 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jan 27 21:26:38 2012 +0000" }, "message": "ARM: 7304/1: ioremap: fix boundary check when reusing static mapping\n\nSince commit 576d2f2525612ecb5af029a76f21f22a3b82563d \"ARM: add\ngeneric ioremap optimization by reusing static mappings\" ioremap()\nis trying to reuse existing static mapping when possible.\n\nThe condition checking boundaries of the requested and existing\nmappings didn\u0027t take in-page offset into consideration though,\nwhich lead to obscure and hard to debug problems when requested\nmapping crossed end of the static one.\n\nSigned-off-by: Pawel Moll \u003cpawel.moll@arm.com\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "eab45486bdd22c81a26bfe97d08ce53afbee5470", "tree": "5dae18d022ba2e2b1e812bd4cdc61ae9643a4659", "parents": [ "2a2d2a42ebdda382e5965162d4d2664d380a7ff4", "acb42a3b611d7ad4cb173c3b37674b549df2ffeb" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Fri Jan 27 19:42:06 2012 +0100" }, "committer": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Fri Jan 27 19:42:06 2012 +0100" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "69e8f430e243d657c2053f097efebc2e2cd559f0", "tree": "5a60cefa0cdfc540a99104b291afcbcfb0c7a39f", "parents": [ "6c02b7b1610f873888af20f291c07730889ff0f9" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jan 25 00:13:20 2012 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Jan 27 11:14:16 2012 -0500" }, "message": "xen/granttable: Disable grant v2 for HVM domains.\n\nAs proper scaffolding for supporting error status is not yet\nimplemented.\n\nBUG: unable to handle kernel NULL pointer dereference at 0000000000000400\nIP: [\u003cffffffff81375ae9\u003e] gnttab_end_foreign_access_ref_v2+0x29/0x40\nPGD 32aa3067 PUD 32a87067 PMD 0\nOops: 0000 [#1] PREEMPT SMP\nCPU 0\nModules linked in: sg sr_mod cdrom ata_generic ata_piix libata scsi_mod xen_blkfront xen_netfront fb_sys_fops sysimgblt sysfillrect syscopyarea xen_kbdfront\ncmd\n\nPid: 2307, comm: ip Not tainted 3.3.0-rc1 #1 Xen HVM domU\nRIP: 0010:[\u003cffffffff81375ae9\u003e] [\u003cffffffff81375ae9\u003e] gnttab_end_foreign_access_ref_v2+0x29/0x40\nRSP: 0018:ffff88003be03d38 EFLAGS: 00010206\nRAX: 0000000000000000 RBX: ffff880033210640 RCX: 0000000000000040\nRDX: 0000000000002000 RSI: 0000000000000000 RDI: 0000000000000200\nRBP: ffff88003be03d38 R08: 0000000000000101 R09: 0000000000000000\nR10: dead000000100100 R11: 0000000000000000 R12: ffff88003be03e48\nR13: 0000000000000001 R14: ffff880039461c00 R15: 0000000000000200\nFS: 00007fb1f84ec700(0000) GS:ffff88003be00000(0000) knlGS:0000000000000000\n...\n\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6c02b7b1610f873888af20f291c07730889ff0f9", "tree": "1b33e6642cc81605b8d37c0bda0abff0ba64fa2d", "parents": [ "7a7546b377bdaa25ac77f33d9433c59f259b9688", "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Jan 27 11:14:02 2012 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Jan 27 11:14:02 2012 -0500" }, "message": "Merge commit \u0027v3.3-rc1\u0027 into stable/for-linus-fixes-3.3\n\n* commit \u0027v3.3-rc1\u0027: (9775 commits)\n Linux 3.3-rc1\n x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits\n qnx4: don\u0027t leak -\u003eBitMap on late failure exits\n qnx4: reduce the insane nesting in qnx4_checkroot()\n qnx4: di_fname is an array, for crying out loud...\n KEYS: Permit key_serial() to be called with a const key pointer\n keys: fix user_defined key sparse messages\n ima: fix cred sparse warning\n uml: fix compile for x86-64\n MPILIB: Add a missing ENOMEM check\n tpm: fix (ACPI S3) suspend regression\n nvme: fix merge error due to change of \u0027make_request_fn\u0027 fn type\n xen: using EXPORT_SYMBOL requires including export.h\n gpio: tps65910: Use correct offset for gpio initialization\n acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec\n intel_idle: Split up and provide per CPU initialization func\n ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2\n tg3: Fix single-vector MSI-X code\n openvswitch: Fix multipart datapath dumps.\n ipv6: fix per device IP snmp counters\n ...\n" }, { "commit": "acb42a3b611d7ad4cb173c3b37674b549df2ffeb", "tree": "7bd1f1262e0524a480250e0fdf532d7d1096f973", "parents": [ "ea9f7a67a24a1b3b81cda5d15c79eda8613f1deb", "2d8357e66df9f7593cbe23b224b4ed06aff90e73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 27 07:56:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 27 07:56:25 2012 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (31 commits)\n gma500: Fix suspend/resume functions\n drm/exynos: fixed pm feature for fimd module.\n MAINTAINERS: added maintainer entry for Exynos DRM Driver.\n drm/exynos: fixed build dependency for DRM_EXYNOS_FIMD\n drm/exynos: fix build dependency for DRM_EXYNOS_HDMI\n drm/exynos: use release_mem_region instead of release_resource\n agp: fix scratch page cleanup\n drm/i915: fixup forcewake spinlock fallout in drpc debugfs function\n drm/i915: debugfs: show semaphore registers also on gen7\n drm/i915: allow userspace forcewake references also on gen7\n drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.\n drm/i915: Correct debugfs printout for RC1e.\n Revert \"drm/i915: Work around gen7 BLT ring synchronization issues.\"\n drm/i915: rip out the HWSTAM missed irq workaround\n drm/i915: paper over missed irq issues with force wake voodoo\n drm/i915: Hold gt_lock across forcewake register reads\n drm/i915: Hold gt_lock during reset\n drm/i915: Move reset forcewake processing to gen6_do_reset\n drm/i915: protect force_wake_(get|put) with the gt_lock\n drm/i915: convert force_wake_get to func pointer in the gpu reset code\n ...\n" }, { "commit": "ea9f7a67a24a1b3b81cda5d15c79eda8613f1deb", "tree": "e22ad0c5ae148297a494be7fe1dc30d3b805123a", "parents": [ "74ea15d909b31158f9b63190a95b52bc05586d4b", "b3a81520bd37a28f77cb0f7002086fb14061824d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 27 07:53:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 27 07:53:06 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: hda - Fix silent output on Haier W18 laptop\n ALSA: hda: set mute led polarity for laptops with buggy BIOS based on SSID\n ALSA: hda - Fix silent output on ASUS A6Rp\n ALSA: Fix memory leak on error in snd_compr_set_params()\n ALSA: ymfpci - Don\u0027t create invalid PCM \u0026 mixers when AC97 doesn\u0027t support\n" }, { "commit": "9998eb703490589c3e8f1bf09b15203156776edb", "tree": "5d01f0e7efae049b9be80292c93fe30f11eeefd1", "parents": [ "9b23062840e7c685ef0a0b561285d6e3a3b6811b" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Wed Jan 25 13:47:40 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Jan 27 10:44:44 2012 -0500" }, "message": "Btrfs: fix reservations in btrfs_page_mkwrite\n\nJosef fixed btrfs_page_mkwrite to properly release reserved\nextents if there was an error. But if we fail to get a reservation\nand we fail to dirty the inode (for ENOSPC reasons), we\u0027ll end up\ntrying to release a reservation we never had.\n\nThis makes sure we only release if we were able to reserve.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "2d8357e66df9f7593cbe23b224b4ed06aff90e73", "tree": "109fcb2cb068ed1fb46994db6e18b9e19899d11c", "parents": [ "24a7eb7954bc22a1d514155d56a3c4cd5e9a6faa" ], "author": { "name": "Ryan Mallon", "email": "rmallon@gmail.com", "time": "Fri Jan 27 17:28:24 2012 +1100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 27 11:52:07 2012 +0000" }, "message": "gma500: Fix suspend/resume functions\n\nBoth the suspend and resume functions incorrectly set psbfb \u003d\nto_psb_fb(NULL) outside of the loop over all of the framebuffers. Fix\nthis by moving the assignment of psbfb inside the loop and removing the\ninitialisation of fb.\n\nSigned-off-by: Ryan Mallon \u003crmallon@gmail.com\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "84e83c2846ffb42772056a0f825d8578dc92d586", "tree": "715f06965c97e12c766a8f12820db021ec362c42", "parents": [ "f6dd94f8194408e11df4e33e1f7113612e84ca17" ], "author": { "name": "Seth Heasley", "email": "seth.heasley@intel.com", "time": "Mon Jan 23 16:40:55 2012 -0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 10:01:16 2012 +0100" }, "message": "watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs\n\nThis patch adds the TCO Watchdog DeviceIDs for the Intel Lynx Point PCH.\n\nSigned-off-by: Seth Heasley \u003cseth.heasley@intel.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "f6dd94f8194408e11df4e33e1f7113612e84ca17", "tree": "1291a7819c036375cd9696794f25d6bb023f9486", "parents": [ "b1785dfd4fcd4011834f914810c1acb46b007a44" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sat Jan 21 15:08:38 2012 +0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 10:00:53 2012 +0100" }, "message": "watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev\n\nLet the watchdog core to check the valid value range of min_timeout/max_timeout.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "b1785dfd4fcd4011834f914810c1acb46b007a44", "tree": "b879461112db5b56e9bcfe5bbd76993aec26d1e8", "parents": [ "8a062ac693d5597b3c5d0e347ce7d1d82b967698" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Fri Jan 20 23:56:19 2012 +0900" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 10:00:15 2012 +0100" }, "message": "watchdog: Fix typo \"unexpectdly\"\n\nCorrect typo \"unexpectdly\" to \"unexpectedly\" in pnx4008_wdt.c\nand stmp3xxx_wdt.c\n\nSigned-off-by: Masanari Iida\u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "8a062ac693d5597b3c5d0e347ce7d1d82b967698", "tree": "66dc98d6f5497b6d8db6433b6297c85a1e058c7a", "parents": [ "ebe06e826faed9d710c3d49fe336c74b5f3a5f2a" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Jan 18 19:26:43 2012 +0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:55:13 2012 +0100" }, "message": "watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options\n\nWhile receiving WDIOS_DISABLECARD option for WDIOC_SETOPTIONS command,\ncall wafwdt_stop() to disable watchdog.\nCall wafwdt_start() while receiving WDIOS_ENABLECARD option.\n\nCurrent code has reverse behavior.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "ebe06e826faed9d710c3d49fe336c74b5f3a5f2a", "tree": "0e9978a29da94a690c3d83f8ee45387f32cd1bd6", "parents": [ "2865e770c9dddd40676eadf7c3dfe80aee7628e4" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Jan 18 19:25:01 2012 +0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:55:04 2012 +0100" }, "message": "watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options\n\nWhile receiving WDIOS_DISABLECARD option for WDIOC_SETOPTIONS command,\ncall wm8350_wdt_stop() to disable watchdog.\nCall wm8350_wdt_start() while receiving WDIOS_ENABLECARD option.\n\nCurrent code has reverse behavior.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "2865e770c9dddd40676eadf7c3dfe80aee7628e4", "tree": "56e4495c3c6d100daf457918cd389c1043b2633e", "parents": [ "e352829a67c1a80c73dfad33ba9dca8ddf2ef0fd" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Jan 18 10:46:52 2012 +0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:54:51 2012 +0100" }, "message": "watchdog: Return proper error in nuc900wdt_probe if misc_register fails\n\nReturn proper error instead of 0 if misc_register fails\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "e352829a67c1a80c73dfad33ba9dca8ddf2ef0fd", "tree": "fe37d341f178521b7072aef891f0c49fbffe964f", "parents": [ "0318e286f9a73547dedfd9f733671f4941efb0e2" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Jan 18 10:45:20 2012 +0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:54:41 2012 +0100" }, "message": "watchdog: Staticise nuc900_wdt\n\nIt is only used in this driver, so no need to make the symbol global.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "0318e286f9a73547dedfd9f733671f4941efb0e2", "tree": "145eb616cde2f0db96feb34f1dd9dfbb7a806e73", "parents": [ "12c583d8dca3320f36afe51e514dfa709ac0662e" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sat Jan 14 19:34:34 2012 +0800" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:54:12 2012 +0100" }, "message": "watchdog: via_wdt: Staticise wdt_pci_table\n\nIt is only used in this driver, so no need to make the symbol global.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Marc Vertes \u003cmarc.vertes@sigfox.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "12c583d8dca3320f36afe51e514dfa709ac0662e", "tree": "42a98cc8f7b9efd0c4e3c46d384218c576e32d07", "parents": [ "52ea9a7d7946c03aa1f9eeb71adb0191402724dd" ], "author": { "name": "Shubhrajyoti D", "email": "shubhrajyoti@ti.com", "time": "Wed Jan 11 19:50:18 2012 +0530" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:53:53 2012 +0100" }, "message": "watchdog: omap_wdt.c: Fix the mismatch of pm_runtime enable and disable\n\nCurrently the watchdog driver calls the pm_runtime_enable and never\nthe disable. This may cause a warning when pm_runtime_enable\nchecks for the count match.\n\nAlso fixes the error\n\n/build/watchdog # insmod omap_wdt.ko\n[ 44.999389] omap_wdt omap_wdt: Unbalanced pm_runtime_enable!\n[ 45.011047] OMAP Watchdog Timer Rev 0x00: initial timeout 60 sec\n/build/watchdog #\n\nAttempting to fix the same by calling pm_runtime_disable.\n\nSigned-off-by: Shubhrajyoti D \u003cshubhrajyoti@ti.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "52ea9a7d7946c03aa1f9eeb71adb0191402724dd", "tree": "6f5baeadfa623f1425453487a4cc7000f74752e2", "parents": [ "5d32d4868ad87a5be8571b22b3d732576504dfb0" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Tue Dec 27 15:01:29 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:53:28 2012 +0100" }, "message": "watchdog: dw_wdt.c: use devm_request_and_ioremap\n\nReimplement a call to devm_request_mem_region followed by a call to ioremap\nor ioremap_nocache by a call to devm_request_and_ioremap.\n\nThe semantic patch that makes this transformation is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@nm@\nexpression myname;\nidentifier i;\n@@\n\nstruct platform_driver i \u003d { .driver \u003d { .name \u003d myname } };\n\n@@\nexpression dev,res,size;\nexpression nm.myname;\n@@\n\n-if (!devm_request_mem_region(dev, res-\u003estart, size,\n- \\(res-\u003ename\\|dev_name(dev)\\|myname\\))) {\n- ...\n- return ...;\n-}\n... when !\u003d res-\u003estart\n(\n-devm_ioremap(dev,res-\u003estart,size)\n+devm_request_and_ioremap(dev,res)\n|\n-devm_ioremap_nocache(dev,res-\u003estart,size)\n+devm_request_and_ioremap(dev,res)\n)\n... when any\n when !\u003d res-\u003estart\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "5d32d4868ad87a5be8571b22b3d732576504dfb0", "tree": "7908b55346143babcf235a27180e7e48fe594c99", "parents": [ "74ea15d909b31158f9b63190a95b52bc05586d4b" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Tue Dec 27 15:01:28 2011 +0100" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Fri Jan 27 09:53:19 2012 +0100" }, "message": "watchdog: imx2_wdt.c: use devm_request_and_ioremap\n\nReimplement a call to devm_request_mem_region followed by a call to ioremap\nor ioremap_nocache by a call to devm_request_and_ioremap.\n\nThe variable res_size is then no longer needed.\n\nThe semantic patch that makes this transformation is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@nm@\nexpression myname;\nidentifier i;\n@@\n\nstruct platform_driver i \u003d { .driver \u003d { .name \u003d myname } };\n\n@@\nexpression dev,res,size;\nexpression nm.myname;\n@@\n\n-if (!devm_request_mem_region(dev, res-\u003estart, size,\n- \\(res-\u003ename\\|dev_name(dev)\\|myname\\))) {\n- ...\n- return ...;\n-}\n... when !\u003d res-\u003estart\n(\n-devm_ioremap(dev,res-\u003estart,size)\n+devm_request_and_ioremap(dev,res)\n|\n-devm_ioremap_nocache(dev,res-\u003estart,size)\n+devm_request_and_ioremap(dev,res)\n)\n... when any\n when !\u003d res-\u003estart\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "24a7eb7954bc22a1d514155d56a3c4cd5e9a6faa", "tree": "a506424edac1363cb2bc339387a2d51e1493b479", "parents": [ "590dfe2f3bbbbeee806ee91bef68ba2a6afc16d2", "373af0c0c539b109ea978e96f217df0fc20aa261" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 27 07:16:27 2012 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 27 07:16:27 2012 +0000" }, "message": "Merge branch \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes\n\n* \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-samsung:\n drm/exynos: fixed pm feature for fimd module.\n MAINTAINERS: added maintainer entry for Exynos DRM Driver.\n drm/exynos: fixed build dependency for DRM_EXYNOS_FIMD\n drm/exynos: fix build dependency for DRM_EXYNOS_HDMI\n drm/exynos: use release_mem_region instead of release_resource\n" }, { "commit": "5e9638643132795e6168bb483e883b6a9678e7b5", "tree": "b167a5233d24ba35330d97717c95d77019646805", "parents": [ "d8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77", "945f82f25f9c49b93c315e0acc6d965cb37e137f" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:15:11 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:15:11 2012 -0800" }, "message": "Merge branch \u0027imx-fixes\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into fixes\n\n* \u0027imx-fixes\u0027 of git://git.pengutronix.de/git/imx/linux-2.6:\n arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap\n ARM: imx: iomux-v1.h: Fix build error due to __init annotation\n" }, { "commit": "d8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77", "tree": "c383591478a2f364deb0523fc2f86aafdd21eac5", "parents": [ "3c8cee3b408ba3d2e2527eef734b5503ac5c9188", "2ab1159e80e8f416071e9f51e4f77b9173948296" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:13:20 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:13:20 2012 -0800" }, "message": "Merge branch \u0027fixes-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes\n\n* \u0027fixes-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:\n mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball\n mach-ux500: enable ARM errata 764369\n mach-ux500: do not override outer.inv_all\n mach-ux500: musb: now musb is always in OTG mode\n" }, { "commit": "3c8cee3b408ba3d2e2527eef734b5503ac5c9188", "tree": "ae26087fe98636cc04d8914452782b9a54b9f777", "parents": [ "d1a8c54b704a4bcf62c0c109ec764277f0bcc57d", "5e540a5a7fd145ff7b2cdf8779b53349287c64a9" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:12:17 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:12:17 2012 -0800" }, "message": "Merge branch \u0027imx6/fixes\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes\n\n* \u0027imx6/fixes\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n ARM: imx6: add missing twd_clk for imx6q clock\n" }, { "commit": "d1a8c54b704a4bcf62c0c109ec764277f0bcc57d", "tree": "cebc0df6224f92f7e554b96bad2daf7e4fe13a64", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f", "14f991a730f453a1c8f114ccb686f83e158fdd92" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:06:52 2012 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Jan 26 23:06:52 2012 -0800" }, "message": "Merge branch \u0027at91-fixes\u0027 of git://github.com/at91linux/linux-at91 into fixes\n\n* \u0027at91-fixes\u0027 of git://github.com/at91linux/linux-at91:\n ARM: at91: Fix at91sam9g45 and at91cap9 reset\n ARM: at91: make rstc soc independent\n ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset\n ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h\n ARM: at91: fix cap9 ddrsdr register\n ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low\n USB: at91: fix clk_get error handling\n ARM: at91: removal of CAP9 SoC family\n ARM: at91: fix at91rm9200 soc subtype handling\n" }, { "commit": "373af0c0c539b109ea978e96f217df0fc20aa261", "tree": "a506424edac1363cb2bc339387a2d51e1493b479", "parents": [ "f15013033e2dd363b3ad181bfd27fa4e8e8ffda8" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jan 27 11:54:58 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jan 27 13:03:59 2012 +0900" }, "message": "drm/exynos: fixed pm feature for fimd module.\n\nthis patch separates fimd specific power on/off function from pm function\nand the pm interfaces will call that function for power on or off.\nand also removes unnecessary codes of resume function.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "cba9384b3c53d1a302206f68134a6cbfbae1d686", "tree": "48c1ee6fad7252b2f16deb8a7265703cbc29c342", "parents": [ "d22b086970c3ee2d327d7dfdcb436254f7f72204" ], "author": { "name": "Guenter Roeck", "email": "linux@roeck-us.net", "time": "Fri Jan 20 02:01:11 2012 -0800" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Jan 26 18:29:57 2012 -0800" }, "message": "MAINTAINERS: Drop maintainer for MAX1668 hwmon driver\n\nDavid no longer has access to MAX1688 hardware, so drop him from the maintainers\nlist.\n\nCc: David George \u003cdgeorgester@gmail.com\u003e\nSigned-off-by: Guenter Roeck \u003clinux@roeck-us.net\u003e\nAcked-by: David George \u003cdgeorgester@gmail.com\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "d22b086970c3ee2d327d7dfdcb436254f7f72204", "tree": "9a2ea0303a8a29c3af1e0f1c79fade0ebc1d8ce0", "parents": [ "86b2bbfdbd1fcc4a3aa62ccd3f245c40c5ad5b85" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sat Jan 21 13:29:27 2012 -0500" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Jan 26 18:29:56 2012 -0800" }, "message": "MAINTAINERS: Add hwmon entries for Wolfson\n\nThe actual driver code seems to have been lost in the shuffle.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "f15013033e2dd363b3ad181bfd27fa4e8e8ffda8", "tree": "c56e66127f7fe71fd49db0543999eb22c896f219", "parents": [ "a4b42dab293afdabc3e4ae57cbc743ad05af0e4b" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Tue Jan 17 14:08:55 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jan 27 10:43:26 2012 +0900" }, "message": "MAINTAINERS: added maintainer entry for Exynos DRM Driver.\n\nI\u0027d like to add my colleagues who dedicated to developing and\nimproving our driver to maintainer entry.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "a4b42dab293afdabc3e4ae57cbc743ad05af0e4b", "tree": "e211a34fa8609848d9589b9f391458277f521c7b", "parents": [ "2363dc636df34abb795c31668eeadc659e815fbd" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Mon Jan 16 18:55:02 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jan 27 10:43:25 2012 +0900" }, "message": "drm/exynos: fixed build dependency for DRM_EXYNOS_FIMD\n\nFB based FIMD and DRM based FIMD drivers use same hardware\nso with this patch, only one of them would be selected.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "2363dc636df34abb795c31668eeadc659e815fbd", "tree": "3eaa0841d25b91ae39eedfe557ff62b1a638f8fc", "parents": [ "485bc54c3360e9c1d595c48c9c82dbd3a51e133e" ], "author": { "name": "Seung-Woo Kim", "email": "sw0312.kim@samsung.com", "time": "Wed Jan 04 15:34:32 2012 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jan 27 10:43:24 2012 +0900" }, "message": "drm/exynos: fix build dependency for DRM_EXYNOS_HDMI\n\nDRM_EXYNOS_HDMI driver and VIDEO_SAMSUNG_S5P_TV driver should be\nnot enabled at once because they use same HW blocks. So dependency\nfor DRM_EXYNOS_HDMI is fixed to check VIDEO_SAMSUNG_S5P_TV\u003dn.\n\nSigned-off-by: Seung-Woo Kim \u003csw0312.kim@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "485bc54c3360e9c1d595c48c9c82dbd3a51e133e", "tree": "5e6f726704f8377d90081e0db5dad0e0dfa50663", "parents": [ "590dfe2f3bbbbeee806ee91bef68ba2a6afc16d2" ], "author": { "name": "Seung-Woo Kim", "email": "sw0312.kim@samsung.com", "time": "Thu Dec 22 11:30:09 2011 +0900" }, "committer": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Fri Jan 27 10:43:23 2012 +0900" }, "message": "drm/exynos: use release_mem_region instead of release_resource\n\nTo make a api pair of request_mem_region and release_mem_region,\nrelease_mem_region is used instead of release_resource.\n\nSigned-off-by: Seung-Woo Kim \u003csw0312.kim@samsung.com\u003e\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "74ea15d909b31158f9b63190a95b52bc05586d4b", "tree": "004badd652ac576dacf5e3c18cc781785eedea9d", "parents": [ "c75d5c5d82146636560ad5b91f3544ae60fc1c57", "c79eba92406acc4898adcd1689fc21a6aa91ed0b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 17:04:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 17:04:47 2012 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:\n [media] cinergyT2-fe: Fix bandwdith settings\n [media] V4L: atmel-isi: add clk_prepare()/clk_unprepare() functions\n [media] cxd2820r: sleep on DVB-T/T2 delivery system switch\n [media] anysee: fix CI init\n [media] cxd2820r: remove unused parameter from cxd2820r_attach\n [media] cxd2820r: fix dvb_frontend_ops\n" }, { "commit": "c75d5c5d82146636560ad5b91f3544ae60fc1c57", "tree": "2ceb03ac95dd3f7889a2d45d72f9342e52fa7583", "parents": [ "2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1", "e51e07e0ac7e3ff847d640f41b7527db04d4a4e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 17:00:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 17:00:38 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc32: forced setting of mode of sun4m per-cpu timers\n" }, { "commit": "9018e93948c6f8f95fbcc9fa05f6c403d6adb406", "tree": "491bb99eb3633a54a1d1f03e671ce16c922b6e74", "parents": [ "f18da14565819ba43b8321237e2426a2914cc2ef" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Jan 26 12:09:28 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 26 17:13:26 2012 -0500" }, "message": "net: explicitly add jump_label.h header to sock.h\n\nCommit 36a1211970193ce215de50ed1e4e1272bc814df1 removed linux/module.h\ninclude statement from one of the headers that end up in net/sock.h.\nIt was providing us with static_branch() definition implicitly, so\nafter its removal the build got broken.\n\nTo fix this, and avoid having this happening in the future,\nlet me do the right thing and include linux/jump_label.h\nexplicitly in sock.h.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f18da14565819ba43b8321237e2426a2914cc2ef", "tree": "263689dd9f9b39e6995c32e13ac725d1153a5641", "parents": [ "f2b3ee9e4200b32d113b1bd3c93f9a836c97357c" ], "author": { "name": "Stefan Gula", "email": "steweg@gmail.com", "time": "Thu Jan 26 11:01:06 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 26 16:35:57 2012 -0500" }, "message": "net: RTNETLINK adjusting values of min_ifinfo_dump_size\n\nSetting link parameters on a netdevice changes the value\nof if_nlmsg_size(), therefore it is necessary to recalculate\nmin_ifinfo_dump_size.\n\nSigned-off-by: Stefan Gula \u003csteweg@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2b3ee9e4200b32d113b1bd3c93f9a836c97357c", "tree": "d80ac5e5fddf395762f2b31110757abf833e752e", "parents": [ "40206dd98f066d596d4280558fc5f798165861c7" ], "author": { "name": "Willem de Bruijn", "email": "willemb@google.com", "time": "Thu Jan 26 10:34:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 26 16:34:08 2012 -0500" }, "message": "ipv6: Fix ip_gre lockless xmits.\n\nTunnel devices set NETIF_F_LLTX to bypass HARD_TX_LOCK. Sit and\nipip set this unconditionally in ops-\u003esetup, but gre enables it\nconditionally after parameter passing in ops-\u003enewlink. This is\nnot called during tunnel setup as below, however, so GRE tunnels are\nstill taking the lock.\n\nmodprobe ip_gre\nip tunnel add test0 mode gre remote 10.5.1.1 dev lo\nip link set test0 up\nip addr add 10.6.0.1 dev test0\n # cat /sys/class/net/test0/features\n # $DIR/test_tunnel_xmit 10 10.5.2.1\nip route add 10.5.2.0/24 dev test0\nip tunnel del test0\n\nThe newlink callback is only called in rtnl_netlink, and only if\nthe device is new, as it calls register_netdevice internally. Gre\ntunnels are created at \u0027ip tunnel add\u0027 with ioctl SIOCADDTUNNEL,\nwhich calls ipgre_tunnel_locate, which calls register_netdev.\nrtnl_newlink is called at \u0027ip link set\u0027, but skips ops-\u003enewlink\nand the device is up with locking still enabled. The equivalent\nipip tunnel works fine, btw (just substitute \u0027method gre\u0027 for\n\u0027method ipip\u0027).\n\nOn kernels before /sys/class/net/*/features was removed [1],\nthe first commented out line returns 0x6000 with method gre,\nwhich indicates that NETIF_F_LLTX (0x1000) is not set. With ipip,\nit reports 0x7000. This test cannot be used on recent kernels where\nthe sysfs file is removed (and ETHTOOL_GFEATURES does not currently\nwork for tunnel devices, because they lack dev-\u003eethtool_ops).\n\nThe second commented out line calls a simple transmission test [2]\nthat sends on 24 cores at maximum rate. Results of a single run:\n\nipip:\t\t\t19,372,306\ngre before patch:\t 4,839,753\ngre after patch:\t19,133,873\n\nThis patch replicates the condition check in ipgre_newlink to\nipgre_tunnel_locate. It works for me, both with oseq on and off.\nThis is the first time I looked at rtnetlink and iproute2 code,\nthough, so someone more knowledgeable should probably check the\npatch. Thanks.\n\nThe tail of both functions is now identical, by the way. To avoid\ncode duplication, I\u0027ll be happy to rework this and merge the two.\n\n[1] http://patchwork.ozlabs.org/patch/104610/\n[2] http://kernel.googlecode.com/files/xmit_udp_parallel.c\n\nSigned-off-by: Willem de Bruijn \u003cwillemb@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf", "tree": "158cd337307a4a4e09a3fb5110f29ab0136bef6c", "parents": [ "4e7682d077d693e34a993ae7a2831b522930ebcb", "0af5e4c36e70cfd4ae96d3704a425c414f530f2a" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 26 21:06:54 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 26 21:06:54 2012 +0000" }, "message": "Merge branch \u0027sa11x0-mcp-fixes\u0027 into fixes\n" }, { "commit": "2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1", "tree": "04d9bb3455da26bce09deb8c9992e370356c6270", "parents": [ "b57cea5e332841ed3e11586c88d3940ea4eacbe7", "5b68edc91cdc972c46f76f85eded7ffddc3ff5c2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:46:07 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:46:07 2012 -0800" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/microcode_amd: Add support for CPU family specific container files\n x86/amd: Add missing feature flag for fam15h models 10h-1fh processors\n x86/boot-image: Don\u0027t leak phdrs in arch/x86/boot/compressed/misc.c::Parse_elf()\n x86/numachip: Drop unnecessary conflict with EDAC\n x86/uv: Fix uninitialized spinlocks\n x86/uv: Fix uv_gpa_to_soc_phys_ram() shift\n" }, { "commit": "b57cea5e332841ed3e11586c88d3940ea4eacbe7", "tree": "cd12fd5c2fe293c98a09e8526f2dc5966059a149", "parents": [ "2437dcbf555bff04e4ee8b8dba4587f946c1cd3d", "46cd6a7f680d14f6f80ede9f04aeb70fa83bd266" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:45:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:45:57 2012 -0800" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf: Call perf_cgroup_event_time() directly\n perf: Don\u0027t call release_callchain_buffers() if allocation fails\n" }, { "commit": "2437dcbf555bff04e4ee8b8dba4587f946c1cd3d", "tree": "f04f3ed779c25caa933744d2d5965ca4e297f05d", "parents": [ "0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a", "b64b223aed5f8aeeb6c046f1b050a8f976b87de0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:45:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:45:41 2012 -0800" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n rcu: Add missing __cpuinit annotation in rcutorture code\n sched: Add \"const\" to is_idle_task() parameter\n rcu: Make rcutorture bool parameters really bool (core code)\n memblock: Fix alloc failure due to dumb underflow protection in memblock_find_in_range_node()\n" }, { "commit": "0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a", "tree": "93eefb55eb9a9e41053e6de032e49e92c7be5574", "parents": [ "87f71ae2dd7471c1b4c94100be1f218e91dc64c3", "2a3535069e33d8b416f406c159ce924427315303" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:43:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 12:43:57 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k: Fix assembler constraint to prevent overeager gcc optimisation\n mac_esp: rename irq\n mac_scsi: dont enable mac_scsi irq before requesting it\n macfb: fix black and white modes\n m68k/irq: Remove obsolete IRQ_FLG_* definitions\n\nFix up trivial conflict in arch/m68k/kernel/process_mm.c as per Geert.\n" }, { "commit": "9b23062840e7c685ef0a0b561285d6e3a3b6811b", "tree": "47c00ad85dced3c4712b03de926b77c4aad99a77", "parents": [ "0c4e538bccc106872d31b1514570b4dac95fb7f2" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "message": "Btrfs: advance window_start if we\u0027re using a bitmap\n\nIf we span a long area in a bitmap we could end up taking a lot of time\nsearching to the next free area if we\u0027re searching from the original\nwindow_start, so advance window_start in order to make sure we don\u0027t do any\nsuperficial searching. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0c4e538bccc106872d31b1514570b4dac95fb7f2", "tree": "094ecf6900b15dc8fd9e2a46cd0875e2c14cdcb9", "parents": [ "9e622d6bea0202e9fe267955362c01918562c09b" ], "author": { "name": "David Sterba", "email": "dsterba@suse.cz", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "message": "btrfs: mask out gfp flags in releasepage\n\nbtree_releasepage is a callback and can be passed unknown gfp flags and then\nthey may end up in kmem_cache_alloc called from alloc_extent_state, slab\nallocator will BUG_ON when there is HIGHMEM or DMA32 flag set.\n\nThis may happen when btrfs is mounted from a loop device, which masks out\n__GFP_IO flag. The check in try_release_extent_state\n\n3399 if ((mask \u0026 GFP_NOFS) \u003d\u003d GFP_NOFS)\n3400 mask \u003d GFP_NOFS;\n\nwill not work and passes unfiltered flags further resulting in crash at\nmm/slab.c:2963\n\n [\u003c000000000024ae4c\u003e] cache_alloc_refill+0x3b4/0x5c8\n [\u003c000000000024c810\u003e] kmem_cache_alloc+0x204/0x294\n [\u003c00000000001fd3c2\u003e] mempool_alloc+0x52/0x170\n [\u003c000003c000ced0b0\u003e] alloc_extent_state+0x40/0xd4 [btrfs]\n [\u003c000003c000cee5ae\u003e] __clear_extent_bit+0x38a/0x4cc [btrfs]\n [\u003c000003c000cee78c\u003e] try_release_extent_state+0x9c/0xd4 [btrfs]\n [\u003c000003c000cc4c66\u003e] btree_releasepage+0x7e/0xd0 [btrfs]\n [\u003c0000000000210d84\u003e] shrink_page_list+0x6a0/0x724\n [\u003c0000000000211394\u003e] shrink_inactive_list+0x230/0x578\n [\u003c0000000000211bb8\u003e] shrink_list+0x6c/0x120\n [\u003c0000000000211e4e\u003e] shrink_zone+0x1e2/0x228\n [\u003c0000000000211f24\u003e] shrink_zones+0x90/0x254\n [\u003c0000000000213410\u003e] do_try_to_free_pages+0xac/0x420\n [\u003c0000000000213ae0\u003e] try_to_free_pages+0x13c/0x1b0\n [\u003c0000000000204e6c\u003e] __alloc_pages_nodemask+0x5b4/0x9a8\n [\u003c00000000001fb04a\u003e] grab_cache_page_write_begin+0x7e/0xe8\n\nSigned-off-by: David Sterba \u003cdsterba@suse.cz\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "9e622d6bea0202e9fe267955362c01918562c09b", "tree": "75b73fbfec2c56ba9ccbe909586cf0f27aba96e1", "parents": [ "7ec31b548a17f773ab6289e795ed3a6820e8b56e" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "message": "Btrfs: fix enospc error caused by wrong checks of the chunk\n\nWhen we did sysbench test for inline files, enospc error happened easily though\nthere was lots of free disk space which could be allocated for new chunks.\n\nReproduce steps:\n # mkfs.btrfs -b $((2 * 1024 * 1024 * 1024)) \u003ctest partition\u003e\n # mount \u003ctest partition\u003e /mnt\n # ulimit -n 102400\n # cd /mnt\n # sysbench --num-threads\u003d1 --test\u003dfileio --file-num\u003d81920 \\\n \u003e --file-total-size\u003d80M --file-block-size\u003d1K --file-io-mode\u003dsync \\\n \u003e --file-test-mode\u003dseqwr prepare\n # sysbench --num-threads\u003d1 --test\u003dfileio --file-num\u003d81920 \\\n \u003e --file-total-size\u003d80M --file-block-size\u003d1K --file-io-mode\u003dsync \\\n \u003e --file-test-mode\u003dseqwr run\n \u003csoon later, BUG_ON() was triggered by enospc error\u003e\n\nThe reason of this bug is:\nNow, we can reserve space which is larger than the free space in the chunks if\nwe have enough free disk space which can be used for new chunks. By this way,\nthe space allocator should allocate a new chunk by force if there is no free\nspace in the free space cache. But there are two wrong checks which break this\noperation.\n\nOne is\n\tif (ret \u003d\u003d -ENOSPC \u0026\u0026 num_bytes \u003e min_alloc_size)\nin btrfs_reserve_extent(), it is wrong, we should try to allocate a new chunk\neven we fail to allocate free space by minimum allocable size.\n\nThe other is\n\tif (space_info-\u003eforce_alloc)\n\t\tforce \u003d space_info-\u003eforce_alloc;\nin do_chunk_alloc(). It makes the allocator ignore CHUNK_ALLOC_FORCE If someone\nsets -\u003eforce_alloc to CHUNK_ALLOC_LIMITED, and makes the enospc error happen.\n\nFix these two wrong checks. Especially the second one, we fix it by changing\nthe value of CHUNK_ALLOC_LIMITED and CHUNK_ALLOC_FORCE, and make\nCHUNK_ALLOC_FORCE greater than CHUNK_ALLOC_LIMITED since CHUNK_ALLOC_FORCE has\nhigher priority. And if the value which is passed in by the caller is greater\nthan -\u003eforce_alloc, use the passed value.\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "7ec31b548a17f773ab6289e795ed3a6820e8b56e", "tree": "c0c738e7c27e4ac6185f02acd76de64986218906", "parents": [ "0b485143d835c019cddc45f46e4b3873dcc9aa4e" ], "author": { "name": "Liu Bo", "email": "liubo2009@cn.fujitsu.com", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:12 2012 -0500" }, "message": "Btrfs: do not defrag a file partially\n\nxfstests 218 complains that btrfs defrags a file partially:\n After: 1\n Write backwards sync, but contiguous - should defrag to 1 extent\n Before: 10\n-After: 1\n+After: 2\n\nTo fix this, we need to set max_to_defrag count properly.\n\nSigned-off-by: Liu Bo \u003cliubo2009@cn.fujitsu.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0b485143d835c019cddc45f46e4b3873dcc9aa4e", "tree": "bda30ddfa281c2841ea4b54922b701ea31509cc9", "parents": [ "0b4a9d248f88e6773312f262e8185f23863d984a" ], "author": { "name": "Stefan Behrens", "email": "sbehrens@giantdisaster.de", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "message": "Btrfs: fix warning for 32-bit build of fs/btrfs/check-integrity.c\n\nThere have been 4 warnings on 32-bit build, they are herewith fixed.\n\nSigned-off-by: Stefan Behrens \u003csbehrens@giantdisaster.de\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "0b4a9d248f88e6773312f262e8185f23863d984a", "tree": "bd822950b56730d6be409c98291c4f2ba19678dc", "parents": [ "8bedd51b6121c4607784d75f852828d25d119c52" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "message": "Btrfs: use cluster-\u003ewindow_start when allocating from a cluster bitmap\n\nWe specifically set window_start in the cluster struct to indicate where the\ncluster starts in a bitmap, but we\u0027ve been using min_start to indicate where\nwe\u0027re searching from. This is usually the start of the blockgroup, so\nessentially means we\u0027re constantly searching from the start of any bitmap we\nfind, which completely negates all the trouble we go to in order to setup a\ncluster. So start using window_start to make sure we actually use the area we\nfound. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "8bedd51b6121c4607784d75f852828d25d119c52", "tree": "e9299eb7b70a1d2f0ea5a4e23b53c7a6496eea59", "parents": [ "6dd70ce4eb7429c2ba6dd9fa46f78a0a2a254038" ], "author": { "name": "Mitch Harder", "email": "mitch.harder@sabayonlinux.org", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "message": "Btrfs: Check for NULL page in extent_range_uptodate\n\nA user has encountered a NULL pointer kernel oops in btrfs when\nencountering media errors. The problem has been identified\nas an unhandled NULL pointer returned from find_get_page().\nThis modification simply checks for a NULL page, and returns\nwith an error if found (the extent_range_uptodate() function\nreturns 1 on errors).\n\nAfter testing this patch, the user reported that the error with\nthe NULL pointer oops was solved. However, there is still a\nremaining problem with a thread becoming stuck in\nwait_on_page_locked(page) in the read_extent_buffer_pages(...)\nfunction in extent_io.c\n\n for (i \u003d start_i; i \u003c num_pages; i++) {\n page \u003d extent_buffer_page(eb, i);\n wait_on_page_locked(page);\n if (!PageUptodate(page))\n ret \u003d -EIO;\n }\n\nThis patch leaves the issue with the locked page yet to be resolved.\n\nSigned-off-by: Mitch Harder \u003cmitch.harder@sabayonlinux.org\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "6dd70ce4eb7429c2ba6dd9fa46f78a0a2a254038", "tree": "d527b7a18a05183b9826d42f42e74811d5793cef", "parents": [ "357b9784b79924a31ccded5d9a0c688f48cc28f2" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "message": "btrfs: Fix busyloops in transaction waiting code\n\nwait_log_commit() and wait_for_writer() were using slightly different\nconditions for deciding whether they should call schedule() and whether they\nshould continue in the wait loop. Thus it could happen that we busylooped when\nthe first condition was not true while the second one was. That is burning CPU\ncycles needlessly and is deadly on UP machines...\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "357b9784b79924a31ccded5d9a0c688f48cc28f2", "tree": "ba47dcbcc40b956b30e4b27c790547cb5d3fc563", "parents": [ "b1375d64c539c5b76794be759b62d3f178e67c32" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "message": "Btrfs: make sure a bitmap has enough bytes\n\nWe have only been checking for min_bytes available in bitmap entries, but we\nwon\u0027t successfully setup a bitmap cluster unless it has at least bytes in the\nbitmap, so in the common case min_bytes is 4k and we want something like 2MB, so\nif there are a bunch of bitmap entries with less than 2mb\u0027s in them, we\u0027ll\nsearch all them anyway, which is suboptimal. Fix this check. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "b1375d64c539c5b76794be759b62d3f178e67c32", "tree": "da4f29173700701bc1aa0ad17fdb436305fd3513", "parents": [ "96bdc7dc61fb1b1e8e858dafb13abee8482ba064" ], "author": { "name": "Jan Schmidt", "email": "list.btrfs@jan-o-sch.net", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Thu Jan 26 15:01:11 2012 -0500" }, "message": "Btrfs: fix uninit warning in backref.c\n\nAdded initialization with the declaration of ret. It isn\u0027t set later on the\nswitch-default branch (which should never be taken).\n\nSigned-off-by: Jan Schmidt \u003clist.btrfs@jan-o-sch.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "a0701f04846eee9976e6b3eafca09f2a9d2744ef", "tree": "927972bfd4e4f23e0632a95897e11181a7a92f4b", "parents": [ "b3ef051db763b640d1ff724b616ffba940896b44" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Jan 25 13:52:12 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 26 11:22:42 2012 -0800" }, "message": "uwb \u0026 wusb: fix kconfig error\n\nFix UWB/WUSB kconfig error by changing \u0027select\u0027 to \u0027depends on\u0027.\n\ndrivers/usb/wusbcore/Kconfig:4:error: recursive dependency detected!\ndrivers/usb/wusbcore/Kconfig:4:\tsymbol USB_WUSB is selected by USB_HWA_HCD\ndrivers/usb/host/Kconfig:559:\tsymbol USB_HWA_HCD depends on UWB\ndrivers/uwb/Kconfig:5:\tsymbol UWB is selected by USB_WUSB\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b3ef051db763b640d1ff724b616ffba940896b44", "tree": "38b6e5ffab81baa7d939d6d034a0a03492e03632", "parents": [ "2353f806c97020d4c7709f15eebb49b591f7306d" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Thu Jan 26 12:29:42 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 26 11:22:41 2012 -0800" }, "message": "USB: Realtek cr: fix autopm scheduling while atomic\n\nResolves:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d784345\n\nReported-by: Francis Moreau \u003cfrancis.moro@gmail.com\u003e\nReported-and-tested-by: Christian D \u003cchrisudeussen@gmail.com\u003e\nReported-and-tested-by: Jimmy Dorff \u003cjdorff@phy.duke.edu\u003e\nReported-and-tested-by: collura@ieee.org\nCc: stable@vger.kernel.org # 3.2+\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" } ], "next": "2353f806c97020d4c7709f15eebb49b591f7306d" }