)]}' { "log": [ { "commit": "16642a2e7be23bbda013fc32d8f6c68982eab603", "tree": "346ae485f485f6901e5d8150f0d34d178a7dd448", "parents": [ "51562cba98939da0a1d10fe7c25359b77a069033", "b9142167a2bb979b58b98ffcd928a311b55cbd9f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 18:32:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 18:32:35 2012 -0700" }, "message": "Merge tag \u0027pm-for-3.7-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management updates from Rafael J Wysocki:\n\n - Improved system suspend/resume and runtime PM handling for the SH\n TMU, CMT and MTU2 clock event devices (also used by ARM/shmobile).\n\n - Generic PM domains framework extensions related to cpuidle support\n and domain objects lookup using names.\n\n - ARM/shmobile power management updates including improved support for\n the SH7372\u0027s A4S power domain containing the CPU core.\n\n - cpufreq changes related to AMD CPUs support from Matthew Garrett,\n Andre Przywara and Borislav Petkov.\n\n - cpu0 cpufreq driver from Shawn Guo.\n\n - cpufreq governor fixes related to the relaxing of limit from Michal\n Pecio.\n\n - OMAP cpufreq updates from Axel Lin and Richard Zhao.\n\n - cpuidle ladder governor fixes related to the disabling of states from\n Carsten Emde and me.\n\n - Runtime PM core updates related to the interactions with the system\n suspend core from Alan Stern and Kevin Hilman.\n\n - Wakeup sources modification allowing more helper functions to be\n called from interrupt context from John Stultz and additional\n diagnostic code from Todd Poynor.\n\n - System suspend error code path fix from Feng Hong.\n\nFixed up conflicts in cpufreq/powernow-k8 that stemmed from the\nworkqueue fixes conflicting fairly badly with the removal of support for\nhardware P-state chips. The changes were independent but somewhat\nintertwined.\n\n* tag \u0027pm-for-3.7-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n Revert \"PM QoS: Use spinlock in the per-device PM QoS constraints code\"\n PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled, v2\n cpuidle: rename function name \"__cpuidle_register_driver\", v2\n cpufreq: OMAP: Check IS_ERR() instead of NULL for omap_device_get_by_hwmod_name\n cpuidle: remove some empty lines\n PM: Prevent runtime suspend during system resume\n PM QoS: Use spinlock in the per-device PM QoS constraints code\n PM / Sleep: use resume event when call dpm_resume_early\n cpuidle / ACPI : move cpuidle_device field out of the acpi_processor_power structure\n ACPI / processor: remove pointless variable initialization\n ACPI / processor: remove unused function parameter\n cpufreq: OMAP: remove loops_per_jiffy recalculate for smp\n sections: fix section conflicts in drivers/cpufreq\n cpufreq: conservative: update frequency when limits are relaxed\n cpufreq / ondemand: update frequency when limits are relaxed\n properly __init-annotate pm_sysrq_init()\n cpufreq: Add a generic cpufreq-cpu0 driver\n PM / OPP: Initialize OPP table from device tree\n ARM: add cpufreq transiton notifier to adjust loops_per_jiffy for smp\n cpufreq: Remove support for hardware P-state chips from powernow-k8\n ...\n" }, { "commit": "51562cba98939da0a1d10fe7c25359b77a069033", "tree": "9c18b8ac63eab57a87cb19421734ce9843be30e6", "parents": [ "7fe0b14b725d6d09a1d9e1409bd465cb88b587f9", "13b74085d92feda78bad1045516d332a1e9a3407" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 18:23:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 18:23:35 2012 -0700" }, "message": "Merge tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\nPull libata changes from Jeff Garzik:\n \"Minor libata updates, nothing notable.\n\n 1) Apply -- and then revert -- the FUA feature. Caused disk\n corruption in linux-next, proving it cannot be turned on by\n default.\n\n Net effect to upstream tree: zero\n\n 2) New AHCI platform driver sata_highbank\n\n 3) Improve SCSI MODE SENSE handling; support MODE SELECT\n\n 4) AHCI: support aggressive device sleep (power mgmt)\n\n 5) sata_fsl: minor fix\n\n 6) pata_arasan: clk support\"\n\n* tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n sata_mv: Fix warnings when no PCI\n [libata] Makefile: Fix build error in sata_highbank\n [libata] export ata_dev_set_feature()\n libata-core: use ATA_LBA in ata_build_rw_tf()\n ata/ahci_platform: Add clock framework support\n pata_arasan: add Device Tree probing capability\n pata_arasan: Add clk_{un}prepare() support\n ata: add platform driver for Calxeda AHCI controller\n sata_fsl: add workaround for data length mismatch on freescale V2 controller\n ahci: implement aggressive SATA device sleep support\n ata: define enum constants for IDENTIFY DEVICE\n Revert \"libata: enable SATA disk fua detection on default\"\n [libata] scsi: implement MODE SELECT command\n [libata] scsi: support MODE SENSE request for changeable and default parameters\n [libata] scsi: Remove unlikely() from FUA check\n libata: enable SATA disk fua detection on default\n" }, { "commit": "7fe0b14b725d6d09a1d9e1409bd465cb88b587f9", "tree": "89b5ffca03145618da92c75fb3cc1dda87dbb924", "parents": [ "7a9a2970b5c1c2ce73d4bb84edaa7ebf13e0c841", "536a53a300d0d40152796eefb0a9e6e36ca37f7d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 17:26:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 17:26:42 2012 -0700" }, "message": "Merge tag \u0027spi-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc\n\nPull spi updates from Mark Brown:\n \"No framework work here, only a bunch of driver updates of varying\n sizes:\n\n - Factoring out of the core hardware support from the MXS MMC driver\n by Marek Vasut to allow the hardware to also be used for SPI.\n - Lots of error handling cleanups from Guenter Roeck\n - Removal of the existing Tegra driver which is quite comprehensively\n broken as detailed in the changelog for the removal.\n - DT suppport for the PL022 and GPIO drivers.\n - pinctrl support for OMAP and PL022.\"\n\nPulling from Mark Brown as Grant Likely is still busy moving.\n\n* tag \u0027spi-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc: (53 commits)\n spi: remove completely broken Tegra driver\n spi/imx: set the inactive state of the clock according to the clock polarity\n spi/pl022: get/put resources on suspend/resume\n spi/pl022: use more managed resources\n spi/pl022: Devicetree support w/o platform data\n spi/s3c64xx: Don\u0027t free controller_data on non-dt platforms\n spi: omap2-mcspi: add pinctrl support\n spi/pl022: adopt pinctrl support\n spi: omap2-mcspi: Cleanup the omap2_mcspi_txrx_dma function\n spi/gpio: Fix stub for spi_gpio_probe_dt()\n spi/mxs: Make the SPI block clock speed configurable via DT\n spi: spi-sh-hspi: drop frees of devm_ alloc\u0027d data\n spi/pl022: Fix chipselects pointer computation\n spi: spi-tle62x0: Use module_spi_driver macro\n mxs/spi: Rework the mxs_ssp_timeout to be more readable\n mxs/spi: Decrement the DMA/PIO border\n mxs/spi: Increment the transfer length only if transfer succeeded\n mxs/spi: Fix issues when doing long continuous transfer\n spi: spi-gpio: Add DT bindings\n spi: spi-gpio: store chipselect information in private structure\n ...\n" }, { "commit": "7a9a2970b5c1c2ce73d4bb84edaa7ebf13e0c841", "tree": "bd4909abfcd759b376cfd2fab06281df366f6a0f", "parents": [ "fc47912d9cda50ae6bd9ca30e97e8c03de5b7b60", "d172f5a4ab151a952a0d898ba3b0ff6a020171a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 17:20:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 17:20:40 2012 -0700" }, "message": "Merge tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull infiniband updates from Roland Dreier:\n \"First batch of InfiniBand/RDMA changes for the 3.7 merge window:\n - mlx4 IB support for SR-IOV\n - A couple of SRP initiator fixes\n - Batch of nes hardware driver fixes\n - Fix for long-standing use-after-free crash in IPoIB\n - Other miscellaneous fixes\"\n\nThis merge also removes a new use of __cancel_delayed_work(), and\nreplaces it with the regular cancel_delayed_work() that is now irq-safe\nthanks to the workqueue updates.\n\nThat said, I suspect the sequence in question should probably use\n\"mod_delayed_work()\". I just did the minimal \"don\u0027t use deprecated\nfunctions\" fixup, though.\n\n* tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (45 commits)\n IB/qib: Fix local access validation for user MRs\n mlx4_core: Disable SENSE_PORT for multifunction devices\n mlx4_core: Clean up enabling of SENSE_PORT for older (ConnectX-1/-2) HCAs\n mlx4_core: Stash PCI ID driver_data in mlx4_priv structure\n IB/srp: Avoid having aborted requests hang\n IB/srp: Fix use-after-free in srp_reset_req()\n IB/qib: Add a qib driver version\n RDMA/nes: Fix compilation error when nes_debug is enabled\n RDMA/nes: Print hardware resource type\n RDMA/nes: Fix for crash when TX checksum offload is off\n RDMA/nes: Cosmetic changes\n RDMA/nes: Fix for incorrect MSS when TSO is on\n RDMA/nes: Fix incorrect resolving of the loopback MAC address\n mlx4_core: Fix crash on uninitialized priv-\u003ecmd.slave_sem\n mlx4_core: Trivial cleanups to driver log messages\n mlx4_core: Trivial readability fix: \"0X30\" -\u003e \"0x30\"\n IB/mlx4: Create paravirt contexts for VFs when master IB driver initializes\n mlx4: Modify proxy/tunnel QP mechanism so that guests do no calculations\n mlx4: Paravirtualize Node Guids for slaves\n mlx4: Activate SR-IOV mode for IB\n ...\n" }, { "commit": "fc47912d9cda50ae6bd9ca30e97e8c03de5b7b60", "tree": "d7da6ce3b23c1524e681ee33aa6e21d3c0586108", "parents": [ "06fe918e9f177dc2a0592b0ad40a6ce4920b2033", "dde3ada3d0069855eeb353707b2b0f946191cfd6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 17:16:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 17:16:10 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input updates from Dmitry Torokhov:\n \"A few drivers were updated with device tree bindings and others got a\n few small cleanups and fixes.\"\n\nFix trivial conflict in drivers/input/keyboard/omap-keypad.c due to\nchanges clashing with a whitespace cleanup.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (28 commits)\n Input: wacom - mark Intuos5 pad as in-prox when touching buttons\n Input: synaptics - adjust threshold for treating position values as negative\n Input: hgpk - use %*ph to dump small buffer\n Input: gpio_keys_polled - fix dt pdata-\u003enbuttons\n Input: Add KD[GS]KBDIACRUC ioctls to the compatible list\n Input: omap-keypad - fixed formatting\n Input: tegra - move platform data header\n Input: wacom - add support for EMR on Cintiq 24HD touch\n Input: s3c2410_ts - make s3c_ts_pmops const\n Input: samsung-keypad - use of_get_child_count() helper\n Input: samsung-keypad - use of_match_ptr()\n Input: uinput - fix formatting\n Input: uinput - specify exact bit sizes on userspace APIs\n Input: uinput - mark failed submission requests as free\n Input: uinput - fix race that can block nonblocking read\n Input: uinput - return -EINVAL when read buffer size is too small\n Input: uinput - take event lock when fetching events from buffer\n Input: get rid of MATCH_BIT() macro\n Input: rotary-encoder - add DT bindings\n Input: rotary-encoder - constify platform data pointers\n ...\n" }, { "commit": "06fe918e9f177dc2a0592b0ad40a6ce4920b2033", "tree": "ea58ad79ba9688e8033d8ea762682fc664031b8c", "parents": [ "dff8360a4a079692e65e55fbaa6c5dc605528403", "e1b2dc70cd5b00e17c703163a463d82354b1cc76" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:20:20 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:20:20 2012 -0700" }, "message": "Merge tag \u0027pinctrl-for-v3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pinctrl changes from Linus Walleij:\n \"Some of this stuff is hitting arch/arm/* and have been ACKed by the\n ARM SoC folks, or it\u0027s device tree bindings pertaining to the specific\n driver.\n\n These are the bulk pinctrl changes for kernel v3.7:\n - Add subdrivers for the DB8540 and NHK8815 Nomadik-type ASICs,\n provide platform config for the Nomadik.\n - Add a driver for the i.MX35.\n - Add a driver for the BCM2835, an advanced GPIO expander.\n - Various fixes and clean-ups and minor improvements for the core,\n Nomadik, pinctr-single, sirf drivers.\n - Some platform config for the ux500.\"\n\n* tag \u0027pinctrl-for-v3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (27 commits)\n pinctrl: add bcm2835 driver\n pinctrl: clarify idle vs sleep states\n pinctrl/nomadik: use irq_find_mapping()\n pinctrl: sirf: add lost chained_irq_enter and exit in sirfsoc_gpio_handle_irq\n pinctrl: sirf: initialize the irq_chip pointer of pinctrl_gpio_range\n pinctrl: sirf: fix spinlock deadlock in sirfsoc_gpio_set_input\n pinctrl: sirf: add missing pins to pinctrl list\n pinctrl: sirf: fix a typo in sirfsoc_gpio_probe\n pinctrl: pinctrl-single: add debugfs pin h/w state info\n ARM: ux500: 8500: update I2C sleep states pinctrl\n pinctrl: Fix potential memory leak in pinctrl_register_one_pin()\n ARM: ux500: tidy up pin sleep modes\n ARM: ux500: fix spi2 pin group\n pinctrl: imx: remove duplicated const\n pinctrl: document semantics vs GPIO\n ARM: ux500: 8500: use hsit_a_2 group for HSI\n pinctrl: use kasprintf() in pinmux_request_gpio()\n pinctrl: pinctrl-single: Add pinctrl-single,bits type of mux\n pinctrl/nomadik : add MC1_a_2 pin MC1 function group list\n pinctrl: pinctrl-single: Make sure we do not change bits outside of mask\n ...\n" }, { "commit": "dff8360a4a079692e65e55fbaa6c5dc605528403", "tree": "0ab8ef7595cdfb918b3fd9a8364c6ea6c9c2798f", "parents": [ "916082b073ebb7f4e064cebce0768e34cacde508", "901acf5b2910434501c221a363bb3486b647b5c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:05:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:05:10 2012 -0700" }, "message": "Merge tag \u0027gpio-for-v3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio\n\nPull GPIO changes from Linus Walleij:\n \"So this is the LW GPIO patch stack for v3.7:\n - refactoring from Thierry Redding at Arnd Bergmann\u0027s request to use\n the seq_file iterator interface in gpiolib.\n - A new driver for Avionic Design\u0027s N-bit GPIO expander.\n - Two instances of mutexes replaced by spinlocks from Axel Lin to\n code that is supposed to be fastpath compliant.\n - IRQ demuxer and gpio_to_irq() support for pcf857x by Kuninori\n Morimoto.\n - Dynamic GPIO numbers, device tree support, daisy chaining and some\n other fixes for the 74x164 driver by Maxime Ripard.\n - IRQ domain and device tree support for the tc3589x driver by Lee\n Jones.\n - Some conversion to use managed resources devm_* code.\n - Some instances of clk_prepare() or clk_prepare_enable() added to\n support the new, stricter common clock framework.\n - Some for_each_set_bit() simplifications.\n - Then a lot of fixes as we fixed up all of the above tripping over\n our own shoelaces and that kind of thing.\"\n\n* tag \u0027gpio-for-v3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (34 commits)\n gpio: pcf857x: select IRQ_DOMAIN\n gpio: Document device_node\u0027s det_debounce\n gpio-lpc32xx: Add GPI_28\n gpio: adnp: dt: Reference generic interrupt binding\n gpio: Add Avionic Design N-bit GPIO expander support\n gpio: pxa: using for_each_set_bit to simplify the code\n gpio_msm: using for_each_set_bit to simplify the code\n gpio: Enable the tc3298x GPIO expander driver for Device Tree\n gpio: Provide the tc3589x GPIO expander driver with an IRQ domain\n ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled\n gpio: pcf857x: fixup smatch WARNING\n gpio: 74x164: Add support for the daisy-chaining\n gpio: 74x164: dts: Add documentation for the dt binding\n dt: Fix incorrect reference in gpio-led documentation\n gpio: 74x164: Add device tree support\n gpio: 74x164: Use dynamic gpio number assignment if no pdata is present\n gpio: 74x164: Use devm_kzalloc\n gpio: 74x164: Use module_spi_driver boiler plate function\n gpio: sx150x: Use irq_data_get_irq_chip_data() at appropriate places\n gpio: em: Use irq_data_get_irq_chip_data() at appropriate places\n ...\n" }, { "commit": "916082b073ebb7f4e064cebce0768e34cacde508", "tree": "8a8037ebbaaffb2336ac4526a7f87ac9a22aeafd", "parents": [ "aecdc33e111b2c447b622e287c6003726daa1426" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:01:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 16:01:31 2012 -0700" }, "message": "workqueue: avoid using deprecated functions\n\nThe network merge brought in a few users of functions that got\ndeprecated by the workqueue cleanups: the \u0027system_nrt_wq\u0027 is now the\nsame as the regular system_wq, since all workqueues are now non-\nreentrant.\n\nSimilarly, remove one use of flush_work_sync() - the regular\nflush_work() has become synchronous, and the \"_sync()\" version is thus\ndeprecated as being superfluous.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aecdc33e111b2c447b622e287c6003726daa1426", "tree": "3e7657eae4b785e1a1fb5dfb225dbae0b2f0cfc6", "parents": [ "a20acf99f75e49271381d65db097c9763060a1e8", "a3a6cab5ea10cca64d036851fe0d932448f2fe4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking changes from David Miller:\n\n 1) GRE now works over ipv6, from Dmitry Kozlov.\n\n 2) Make SCTP more network namespace aware, from Eric Biederman.\n\n 3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.\n\n 4) Make openvswitch network namespace aware, from Pravin B Shelar.\n\n 5) IPV6 NAT implementation, from Patrick McHardy.\n\n 6) Server side support for TCP Fast Open, from Jerry Chu and others.\n\n 7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel\n Borkmann.\n\n 8) Increate the loopback default MTU to 64K, from Eric Dumazet.\n\n 9) Use a per-task rather than per-socket page fragment allocator for\n outgoing networking traffic. This benefits processes that have very\n many mostly idle sockets, which is quite common.\n\n From Eric Dumazet.\n\n10) Use up to 32K for page fragment allocations, with fallbacks to\n smaller sizes when higher order page allocations fail. Benefits are\n a) less segments for driver to process b) less calls to page\n allocator c) less waste of space.\n\n From Eric Dumazet.\n\n11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.\n\n12) VXLAN device driver, one way to handle VLAN issues such as the\n limitation of 4096 VLAN IDs yet still have some level of isolation.\n From Stephen Hemminger.\n\n13) As usual there is a large boatload of driver changes, with the scale\n perhaps tilted towards the wireless side this time around.\n\nFix up various fairly trivial conflicts, mostly caused by the user\nnamespace changes.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)\n hyperv: Add buffer for extended info after the RNDIS response message.\n hyperv: Report actual status in receive completion packet\n hyperv: Remove extra allocated space for recv_pkt_list elements\n hyperv: Fix page buffer handling in rndis_filter_send_request()\n hyperv: Fix the missing return value in rndis_filter_set_packet_filter()\n hyperv: Fix the max_xfer_size in RNDIS initialization\n vxlan: put UDP socket in correct namespace\n vxlan: Depend on CONFIG_INET\n sfc: Fix the reported priorities of different filter types\n sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP\n sfc: Fix loopback self-test with separate_tx_channels\u003d1\n sfc: Fix MCDI structure field lookup\n sfc: Add parentheses around use of bitfield macro arguments\n sfc: Fix null function pointer in efx_sriov_channel_type\n vxlan: virtual extensible lan\n igmp: export symbol ip_mc_leave_group\n netlink: add attributes to fdb interface\n tg3: unconditionally select HWMON support when tg3 is enabled.\n Revert \"net: ti cpsw ethernet: allow reading phy interface mode from DT\"\n gre: fix sparse warning\n ...\n" }, { "commit": "a20acf99f75e49271381d65db097c9763060a1e8", "tree": "3cf661125e86b7625171b96b885bf5395f62e684", "parents": [ "437589a74b6a590d175f86cf9f7b2efcee7765e7", "42a4172b6ebb4a419085c6caee7c135e51cae5ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 12:57:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 12:57:42 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next\n\nPull sparc updates from David Miller:\n \"Largely this is simply adding support for the Niagara 4 cpu.\n\n Major areas are perf events (chip now supports 4 counters and can\n monitor any event on each counter), crypto (opcodes are availble for\n sha1, sha256, sha512, md5, crc32c, AES, DES, CAMELLIA, and Kasumi\n although the last is unsupported since we lack a generic crypto layer\n Kasumi implementation), and an optimized memcpy.\n\n Finally some cleanups by Peter Senna Tschudin.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (47 commits)\n sparc64: Fix trailing whitespace in NG4 memcpy.\n sparc64: Fix comment type in NG4 copy from user.\n sparc64: Add SPARC-T4 optimized memcpy.\n drivers/sbus/char: removes unnecessary semicolon\n arch/sparc/kernel/pci_sun4v.c: removes unnecessary semicolon\n sparc64: Fix function argument comment in camellia_sparc64_key_expand asm.\n sparc64: Fix IV handling bug in des_sparc64_cbc_decrypt\n sparc64: Add auto-loading mechanism to crypto-opcode drivers.\n sparc64: Add missing pr_fmt define to crypto opcode drivers.\n sparc64: Adjust crypto priorities.\n sparc64: Use cpu_pgsz_mask for linear kernel mapping config.\n sparc64: Probe cpu page size support more portably.\n sparc64: Support 2GB and 16GB page sizes for kernel linear mappings.\n sparc64: Fix bugs in unrolled 256-bit loops.\n sparc64: Avoid code duplication in crypto assembler.\n sparc64: Unroll CTR crypt loops in AES driver.\n sparc64: Unroll ECB decryption loops in AES driver.\n sparc64: Unroll ECB encryption loops in AES driver.\n sparc64: Add ctr mode support to AES driver.\n sparc64: Move AES driver over to a methods based implementation.\n ...\n" }, { "commit": "a3a6cab5ea10cca64d036851fe0d932448f2fe4f", "tree": "2b8c84eed31e455fef949bf5a47602e7f982514b", "parents": [ "63f6921d300c6fbdca3d0e73dcc24b4e5e4dced2" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Tue Oct 02 05:30:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:39:31 2012 -0400" }, "message": "hyperv: Add buffer for extended info after the RNDIS response message.\n\nIn some response messages, there may be some extended info after the\nmessage.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nReviewed-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63f6921d300c6fbdca3d0e73dcc24b4e5e4dced2", "tree": "5cd2560e12959f51574e0235bc1d9bdb81b30b98", "parents": [ "6562640bd3b368a7ffb1caa61c82abe6e9d54b3b" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Tue Oct 02 05:30:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:39:31 2012 -0400" }, "message": "hyperv: Report actual status in receive completion packet\n\nThe existing code always reports NVSP_STAT_SUCCESS. This patch adds the\nmechanism to report failure when it happens.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nReviewed-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6562640bd3b368a7ffb1caa61c82abe6e9d54b3b", "tree": "3add1f3f656ec7505abd84aaea3355c4c22b60bd", "parents": [ "99e3fcfa34e7ea6dbb44fe5df51b79ccb6f73d3d" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Tue Oct 02 05:30:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:39:30 2012 -0400" }, "message": "hyperv: Remove extra allocated space for recv_pkt_list elements\n\nThe receive code path doesn\u0027t use the page buffer, so remove the\nextra allocated space here.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nReviewed-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99e3fcfa34e7ea6dbb44fe5df51b79ccb6f73d3d", "tree": "e0e136763a441634457ca136522606ce53c8c271", "parents": [ "ea4963745f712a746ccb45871a22e0814141a891" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Tue Oct 02 05:30:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:39:30 2012 -0400" }, "message": "hyperv: Fix page buffer handling in rndis_filter_send_request()\n\nTo prevent possible data corruption in RNDIS requests, add another\npage buffer if the request message crossed page boundary.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nReviewed-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea4963745f712a746ccb45871a22e0814141a891", "tree": "a138176e0cf59b3fbb58c6ec080ab196ca259b11", "parents": [ "fb1d074edb92604f313ac671f67e806c3223d191" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Tue Oct 02 05:30:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:39:30 2012 -0400" }, "message": "hyperv: Fix the missing return value in rndis_filter_set_packet_filter()\n\nReturn ETIMEDOUT when the reply message is not received in time.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nReviewed-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fb1d074edb92604f313ac671f67e806c3223d191", "tree": "244d27dd95de6e2e57f5462d805e4d215f222a60", "parents": [ "bfe1b9b16e3bed06d16826813edf5922fd82d91f" ], "author": { "name": "Haiyang Zhang", "email": "haiyangz@microsoft.com", "time": "Tue Oct 02 05:30:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:39:30 2012 -0400" }, "message": "hyperv: Fix the max_xfer_size in RNDIS initialization\n\nAccording to RNDIS specs, Windows sets this size to\n0x4000. I use the same value here.\n\nSigned-off-by: Haiyang Zhang \u003chaiyangz@microsoft.com\u003e\nReviewed-by: K. Y. Srinivasan \u003ckys@microsoft.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfe1b9b16e3bed06d16826813edf5922fd82d91f", "tree": "4be855263ce4ef237a93c3b0971de26c69b36746", "parents": [ "aaba1f58a73a285aefac825e5eafad1d211c43de" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 01 18:49:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:38:04 2012 -0400" }, "message": "vxlan: put UDP socket in correct namespace\n\nMove vxlan UDP socket to correct network namespace\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aaba1f58a73a285aefac825e5eafad1d211c43de", "tree": "51d8e9cffbf9df1682389226b7c848c308e4038a", "parents": [ "d3d5df2c4b86786ea792b073f0df9cd82f7efcaa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:37:31 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 02 14:37:31 2012 -0400" }, "message": "vxlan: Depend on CONFIG_INET\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "437589a74b6a590d175f86cf9f7b2efcee7765e7", "tree": "37bf8635b1356d80ef002b00e84f3faf3d555a63", "parents": [ "68d47a137c3bef754923bccf73fb639c9b0bbd5e", "72235465864d84cedb2d9f26f8e1de824ee20339" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 11:11:09 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace changes from Eric Biederman:\n \"This is a mostly modest set of changes to enable basic user namespace\n support. This allows the code to code to compile with user namespaces\n enabled and removes the assumption there is only the initial user\n namespace. Everything is converted except for the most complex of the\n filesystems: autofs4, 9p, afs, ceph, cifs, coda, fuse, gfs2, ncpfs,\n nfs, ocfs2 and xfs as those patches need a bit more review.\n\n The strategy is to push kuid_t and kgid_t values are far down into\n subsystems and filesystems as reasonable. Leaving the make_kuid and\n from_kuid operations to happen at the edge of userspace, as the values\n come off the disk, and as the values come in from the network.\n Letting compile type incompatible compile errors (present when user\n namespaces are enabled) guide me to find the issues.\n\n The most tricky areas have been the places where we had an implicit\n union of uid and gid values and were storing them in an unsigned int.\n Those places were converted into explicit unions. I made certain to\n handle those places with simple trivial patches.\n\n Out of that work I discovered we have generic interfaces for storing\n quota by projid. I had never heard of the project identifiers before.\n Adding full user namespace support for project identifiers accounts\n for most of the code size growth in my git tree.\n\n Ultimately there will be work to relax privlige checks from\n \"capable(FOO)\" to \"ns_capable(user_ns, FOO)\" where it is safe allowing\n root in a user names to do those things that today we only forbid to\n non-root users because it will confuse suid root applications.\n\n While I was pushing kuid_t and kgid_t changes deep into the audit code\n I made a few other cleanups. I capitalized on the fact we process\n netlink messages in the context of the message sender. I removed\n usage of NETLINK_CRED, and started directly using current-\u003etty.\n\n Some of these patches have also made it into maintainer trees, with no\n problems from identical code from different trees showing up in\n linux-next.\n\n After reading through all of this code I feel like I might be able to\n win a game of kernel trivial pursuit.\"\n\nFix up some fairly trivial conflicts in netfilter uid/git logging code.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (107 commits)\n userns: Convert the ufs filesystem to use kuid/kgid where appropriate\n userns: Convert the udf filesystem to use kuid/kgid where appropriate\n userns: Convert ubifs to use kuid/kgid\n userns: Convert squashfs to use kuid/kgid where appropriate\n userns: Convert reiserfs to use kuid and kgid where appropriate\n userns: Convert jfs to use kuid/kgid where appropriate\n userns: Convert jffs2 to use kuid and kgid where appropriate\n userns: Convert hpfs to use kuid and kgid where appropriate\n userns: Convert btrfs to use kuid/kgid where appropriate\n userns: Convert bfs to use kuid/kgid where appropriate\n userns: Convert affs to use kuid/kgid wherwe appropriate\n userns: On alpha modify linux_to_osf_stat to use convert from kuids and kgids\n userns: On ia64 deal with current_uid and current_gid being kuid and kgid\n userns: On ppc convert current_uid from a kuid before printing.\n userns: Convert s390 getting uid and gid system calls to use kuid and kgid\n userns: Convert s390 hypfs to use kuid and kgid where appropriate\n userns: Convert binder ipc to use kuids\n userns: Teach security_path_chown to take kuids and kgids\n userns: Add user namespace support to IMA\n userns: Convert EVM to deal with kuids and kgids in it\u0027s hmac computation\n ...\n" }, { "commit": "c0e8a139a5bb8add02b4111e9e1957d810d7285e", "tree": "f5f0695c7553c0f651ea3c714191dedf76e06c78", "parents": [ "033d9959ed2dc1029217d4165f80a71702dc578e", "a6f00298b2ceaf50b4ab00e6ee3eb0206ac72fac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:50:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 10:50:47 2012 -0700" }, "message": "Merge branch \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup updates from Tejun Heo:\n\n - xattr support added. The implementation is shared with tmpfs. The\n usage is restricted and intended to be used to manage per-cgroup\n metadata by system software. tmpfs changes are routed through this\n branch with Hugh\u0027s permission.\n\n - cgroup subsystem ID handling simplified.\n\n* \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: Define CGROUP_SUBSYS_COUNT according the configuration\n cgroup: Assign subsystem IDs during compile time\n cgroup: Do not depend on a given order when populating the subsys array\n cgroup: Wrap subsystem selection macro\n cgroup: Remove CGROUP_BUILTIN_SUBSYS_COUNT\n cgroup: net_prio: Do not define task_netpioidx() when not selected\n cgroup: net_cls: Do not define task_cls_classid() when not selected\n cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h\n cgroup: trivial fixes for Documentation/cgroups/cgroups.txt\n xattr: mark variable as uninitialized to make both gcc and smatch happy\n fs: add missing documentation to simple_xattr functions\n cgroup: add documentation on extended attributes usage\n cgroup: rename subsys_bits to subsys_mask\n cgroup: add xattr support\n cgroup: revise how we re-populate root directory\n xattr: extract simple_xattr code from tmpfs\n" }, { "commit": "033d9959ed2dc1029217d4165f80a71702dc578e", "tree": "3d306316e44bdabce2e0bf2ef7e466e525f90b4c", "parents": [ "974a847e00cf3ff1695e62b276892137893706ab", "7c6e72e46c9ea4a88f3f8ba96edce9db4bd48726" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 09:54:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 09:54:49 2012 -0700" }, "message": "Merge branch \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\nPull workqueue changes from Tejun Heo:\n \"This is workqueue updates for v3.7-rc1. A lot of activities this\n round including considerable API and behavior cleanups.\n\n * delayed_work combines a timer and a work item. The handling of the\n timer part has always been a bit clunky leading to confusing\n cancelation API with weird corner-case behaviors. delayed_work is\n updated to use new IRQ safe timer and cancelation now works as\n expected.\n\n * Another deficiency of delayed_work was lack of the counterpart of\n mod_timer() which led to cancel+queue combinations or open-coded\n timer+work usages. mod_delayed_work[_on]() are added.\n\n These two delayed_work changes make delayed_work provide interface\n and behave like timer which is executed with process context.\n\n * A work item could be executed concurrently on multiple CPUs, which\n is rather unintuitive and made flush_work() behavior confusing and\n half-broken under certain circumstances. This problem doesn\u0027t\n exist for non-reentrant workqueues. While non-reentrancy check\n isn\u0027t free, the overhead is incurred only when a work item bounces\n across different CPUs and even in simulated pathological scenario\n the overhead isn\u0027t too high.\n\n All workqueues are made non-reentrant. This removes the\n distinction between flush_[delayed_]work() and\n flush_[delayed_]_work_sync(). The former is now as strong as the\n latter and the specified work item is guaranteed to have finished\n execution of any previous queueing on return.\n\n * In addition to the various bug fixes, Lai redid and simplified CPU\n hotplug handling significantly.\n\n * Joonsoo introduced system_highpri_wq and used it during CPU\n hotplug.\n\n There are two merge commits - one to pull in IRQ safe timer from\n tip/timers/core and the other to pull in CPU hotplug fixes from\n wq/for-3.6-fixes as Lai\u0027s hotplug restructuring depended on them.\"\n\nFixed a number of trivial conflicts, but the more interesting conflicts\nwere silent ones where the deprecated interfaces had been used by new\ncode in the merge window, and thus didn\u0027t cause any real data conflicts.\n\nTejun pointed out a few of them, I fixed a couple more.\n\n* \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)\n workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()\n workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()\n workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()\n workqueue: remove @delayed from cwq_dec_nr_in_flight()\n workqueue: fix possible stall on try_to_grab_pending() of a delayed work item\n workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()\n workqueue: use __cpuinit instead of __devinit for cpu callbacks\n workqueue: rename manager_mutex to assoc_mutex\n workqueue: WORKER_REBIND is no longer necessary for idle rebinding\n workqueue: WORKER_REBIND is no longer necessary for busy rebinding\n workqueue: reimplement idle worker rebinding\n workqueue: deprecate __cancel_delayed_work()\n workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()\n workqueue: use mod_delayed_work() instead of __cancel + queue\n workqueue: use irqsafe timer for delayed_work\n workqueue: clean up delayed_work initializers and add missing one\n workqueue: make deferrable delayed_work initializer names consistent\n workqueue: cosmetic whitespace updates for macro definitions\n workqueue: deprecate system_nrt[_freezable]_wq\n workqueue: deprecate flush[_delayed]_work_sync()\n ...\n" }, { "commit": "d172f5a4ab151a952a0d898ba3b0ff6a020171a6", "tree": "9579f3af31f7d76276108bd60ec9c35b2bd18a25", "parents": [ "2a22fb8c69275903b8be4c6203aa08bfac374844", "c079c28714e4d1a0b7cad120f84217e0fcde09a6", "bea1e22df494a729978e7f2c54f7bda328f74bc3", "a084feebd24764fab9657a586ea65484ddbd79cf", "aadf4f3f66a7b710b05b31ac0839fbbf59e41f7c", "bca1935ccdecf2354a55d9edab4c022a995ee490", "c00aaa1a0221a22153071fcb2f320e2ebaecc2fd", "d8536670916a685df116b5c2cb256573fd25e4e3" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Oct 02 07:43:59 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Oct 02 07:43:59 2012 -0700" }, "message": "Merge branches \u0027cma\u0027, \u0027cxgb4\u0027, \u0027ipoib\u0027, \u0027mlx4\u0027, \u0027mlx4-sriov\u0027, \u0027nes\u0027, \u0027qib\u0027 and \u0027srp\u0027 into for-linus\n" }, { "commit": "13b74085d92feda78bad1045516d332a1e9a3407", "tree": "fbefc92b01ca88fc3ccbdcff1b4986dd6fd15f0d", "parents": [ "40dad0af2d5c3122d883b2baed4bb39baf6561ec" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Fri Sep 28 17:04:10 2012 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Mon Oct 01 22:53:23 2012 -0400" }, "message": "sata_mv: Fix warnings when no PCI\n\nDove can be configured without PCI. We then get a number of warnings:\n\nwarning: \u0027msi\u0027 defined but not used\nwarning: \u0027mv5_sht\u0027 defined but not used\nwarning: \u0027mv_dump_pci_cfg\u0027 defined but not used.\n\nMove around variables and add #ifdef as necassary to fix the warnings.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "40dad0af2d5c3122d883b2baed4bb39baf6561ec", "tree": "1c6d52aa39f08b1dac2689d97fb9b40257608a12", "parents": [ "633de4cc2c049949459dd0b73d78576cd23906b5" ], "author": { "name": "Mark Langsdorf", "email": "Mark Langsdorf", "time": "Fri Sep 28 12:23:37 2012 -0500" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Mon Oct 01 22:50:37 2012 -0400" }, "message": "[libata] Makefile: Fix build error in sata_highbank\n\nAllow sata_highbank to build even if no other users of libahci.o are built.\n\nSigned-off-by: Mark Langsdorf \u003cmark.langsdorf@calxeda.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "974a847e00cf3ff1695e62b276892137893706ab", "tree": "a9454dc32de4738c463f514c37b35106d1e9b2e9", "parents": [ "9cd11c0c47b8690b47e7573311ce5c483cb344ed" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Thu Sep 20 16:14:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 19:39:48 2012 -0700" }, "message": "drivers: bus: omap_l3: fixup merge conflict resolution\n\nThis fixes a local merge conflict resolution done wrong locally in\narm-soc for-next. soc.h was added on a cleanup branch, but the driver\nwas moved and the header no longer needed.\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n[ .. and I did the same wrong merge, since git automatically does the\n whole rename detection etc, so applying this patch from Olof - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9cd11c0c47b8690b47e7573311ce5c483cb344ed", "tree": "59f51c2bb3f73b21005105095d7321d35616ca9d", "parents": [ "b9541d94bcd2f23a069dbe84830fef1bbcd643f0", "1ec9c26ad0890003f2b8a4ab97164f66d5de3f6d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 19:11:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 19:11:38 2012 -0700" }, "message": "Merge tag \u0027multiplatform\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM soc multiplatform enablement from Olof Johansson:\n \"This is a pretty significant branch. It\u0027s the introduction of the\n first multiplatform support on ARM, and with this (and the later\n branch) merged, it is now possible to build one kernel that contains\n support for highbank, vexpress, mvebu, socfpga, and picoxcell. More\n platforms will be convered over in the next few releases.\n\n Two critical last things had to be done for this to be practical and\n possible:\n * Today each platform has its own include directory under\n mach-\u003cmach\u003e/include/mach/*, and traditionally that is where a lot\n of driver/platform shared definitions have gone, such as platform\n data structures. They now need to move out to a common location\n instead, and this branch moves a large number of those out to\n include/linux/platform_data.\n * Each platform used to list the device trees to compile for its\n boards in mach-\u003cmach\u003e/Makefile.boot.\n\n Both of the above changes will mean that there are some merge\n conflicts to come (and some to resolve here). It\u0027s a one-time move\n and once it settles in, we should be good for quite a while. Sorry\n for the overhead.\"\n\nFix conflicts as per Olof.\n\n* tag \u0027multiplatform\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)\n ARM: add v7 multi-platform defconfig\n ARM: msm: Move core.h contents into common.h\n ARM: highbank: call highbank_pm_init from .init_machine\n ARM: dtb: move all dtb targets to common Makefile\n ARM: spear: move platform_data definitions\n ARM: samsung: move platform_data definitions\n ARM: orion: move platform_data definitions\n ARM: vexpress: convert to multi-platform\n ARM: initial multiplatform support\n ARM: mvebu: move armada-370-xp.h in mach dir\n ARM: vexpress: remove dependency on mach/* headers\n ARM: picoxcell: remove dependency on mach/* headers\n ARM: move all dtb targets out of Makefile.boot\n ARM: picoxcell: move debug macros to include/debug\n ARM: socfpga: move debug macros to include/debug\n ARM: mvebu: move debug macros to include/debug\n ARM: vexpress: move debug macros to include/debug\n ARM: highbank: move debug macros to include/debug\n ARM: move debug macros to common location\n ARM: make mach/gpio.h headers optional\n ...\n" }, { "commit": "8f446a7a069e0af0639385f67c78ee2279bca04c", "tree": "580cf495616b36ca0af0826afa87c430cdc1e7cb", "parents": [ "84be4ae2c038e2b03d650cbf2a7cfd9e8d6e9e51", "04ef037c926ddb31088c976538e29eada4fd1490" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:46:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:46:13 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM soc driver specific changes from Olof Johansson:\n - A long-coming conversion of various platforms to a common LED\n infrastructure\n - AT91 is moved over to use the newer MCI driver for MMC\n - Pincontrol conversions for samsung platforms\n - DT bindings for gscaler on samsung\n - i2c driver fixes for tegra, acked by i2c maintainer\n\nFix up conflicts as per Olof.\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n drivers: bus: omap_l3: use resources instead of hardcoded irqs\n pinctrl: exynos: Fix wakeup IRQ domain registration check\n pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data\n pinctrl: exynos: Correct the detection of wakeup-eint node\n pinctrl: exynos: Mark exynos_irq_demux_eint as inline\n pinctrl: exynos: Handle only unmasked wakeup interrupts\n pinctrl: exynos: Fix typos in gpio/wkup _irq_mask\n pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa\n drivers: bus: Move the OMAP interconnect driver to drivers/bus/\n i2c: tegra: dynamically control fast clk\n i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20\n ARM: tegra: clock: remove unused clock entry for i2c\n ARM: tegra: clock: add connection name in i2c clock entry\n i2c: tegra: pass proper name for getting clock\n ARM: tegra: clock: add i2c fast clock entry in clock table\n ARM: EXYNOS: Adds G-Scaler device from Device Tree\n ARM: EXYNOS: Add clock support for G-Scaler\n ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform\n ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC\n ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used\n ...\n" }, { "commit": "84be4ae2c038e2b03d650cbf2a7cfd9e8d6e9e51", "tree": "06f806cdc8bded9ae81c963287beb73a6e961d4b", "parents": [ "ac9e7ab32fe42489808c8d9fc89ad413d2805766", "36246a820075b65907112891b77ff7915fdb06a5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:35:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:35:58 2012 -0700" }, "message": "Merge tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM soc-specific updates, take 2 from Olof Johansson:\n \"This branch converts the MXS Freescale platform to use irqdomains and\n sparse IRQ, in preparation for DT probing and multiplatform kernels.\"\n\n* tag \u0027soc2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: mxs: remove mach/irqs.h\n ARM: mxs: select SPARSE_IRQ\n ARM: mxs: adopt irq_domain support for icoll driver\n ARM: mxs: select MULTI_IRQ_HANDLER\n ARM: mxs: retrieve timer irq from device tree\n gpio/mxs: adopt irq_domain support for mxs gpio driver\n" }, { "commit": "d3d5df2c4b86786ea792b073f0df9cd82f7efcaa", "tree": "1b7658dbe2e5a8db6ba3d166812b153b2fabcb13", "parents": [ "d342894c5d2f8c7df194c793ec4059656e09ca31", "6ac7ef1487a040483d89a95045efc5185a71268f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 21:32:55 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 21:32:55 2012 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next\n\nBen Hutchings says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nSome bug fixes that should go into 3.7:\n\n1. Fix oops when removing device with SR-IOV enabled. (This regression\nwas introduced by the last set of changes, so the fix does not need to\nbe applied to any earlier kernel versions.)\n2. Fix firmware structure field lookup bug that resulted in missing\nsensor information.\n3. Fix bug that makes self-test do very little in some configurations.\n4. Fix the numbering of ethtool RX flow steering filters to reflect the\nreal hardware priorities.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ac9e7ab32fe42489808c8d9fc89ad413d2805766", "tree": "d5628b62e23fae6a0acd000a7bb16030c89f2073", "parents": [ "2a2bf85f05e42b12ea6bfe821e2d19221cf93555", "b98138e00d96abc85b100c9b6886f105d9868ab5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:32:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:32:45 2012 -0700" }, "message": "Merge tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM soc cleanups, part 2 from Olof Johansson:\n \"A shorter cleanup branch submitted separately due to dependencies with\n some of the previous topics.\n\n Major thing here is that the Broadcom bcmring platform is removed.\n It\u0027s an SoC that\u0027s used on some stationary VoIP platforms, and is in\n desperate need of some cleanup. Broadcom came back and suggested that\n we just deprecate the platform for now, since they aren\u0027t going to\n spend the resources needed on cleaning it up, and there are no users\n of the platform directly from mainline.\"\n\nFix some conflicts due to BCM2835 getting added next to the removed\nBCMRING, and removal of tegra files that had been converted to\ndevicetree.\n\n* tag \u0027cleanup2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.\n ARM: ux500: use __iomem pointers for MMIO\n ARM: Remove mach-bcmring\n ARM: clps711x: Remove board support for CEIVA\n ARM: clps711x: Fix register definitions\n ARM: clps711x: Fix lowlevel debug-macro\n ARM: clps711x: Added simple clock framework\n pinctrl: tegra: move pinconf-tegra.h content into drivers/pinctrl\n ARM: tegra: delete unused headers\n ARM: tegra: remove useless includes of \u003cmach/*.h\u003e\n ARM: tegra: remove dead code\n" }, { "commit": "2a2bf85f05e42b12ea6bfe821e2d19221cf93555", "tree": "11abcdaef6e4f8307574056998d306d21558b6ed", "parents": [ "11801e9de26992d37cb869cc74f389b6a7677e0e", "99261fbad0a16f105b262d7525801697588ba526" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:28:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:28:06 2012 -0700" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM soc device tree updates from Olof Johansson:\n \"Device tree conversion and enablement branch. Mostly a bunch of new\n bindings and setup for various platforms, but the Via/Winchip VT8500\n platform is also converted over from being 100% legacy to now use\n device tree for probing. More of that will come for 3.8.\"\n\nTrivial conflicts due to removal of vt8500 files, and one documentation\nfile that was added with slightly different contents both here and in\nthe USb tree.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (212 commits)\n arm: vt8500: Fixup for missing gpio.h\n ARM: LPC32xx: LED fix in PHY3250 DTS file\n ARM: dt: mmp-dma: add binding file\n arm: vt8500: Update arch-vt8500 to devicetree support.\n arm: vt8500: gpio: Devicetree support for arch-vt8500\n arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices\n arm: vt8500: clk: Add Common Clock Framework support\n video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb\n serial: vt8500: Add devicetree support for vt8500-serial\n rtc: vt8500: Add devicetree support for vt8500-rtc\n arm: vt8500: Add device tree files for VIA/Wondermedia SoC\u0027s\n ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support\n ARM: tegra: Add Avionic Design Medcom-Wide support\n ARM: tegra: Add Avionic Design Plutux support\n ARM: tegra: Add Avionic Design Tamonten support\n ARM: tegra: dts: Add pwm label\n ARM: ux500: Fix SSP register address format\n ARM: ux500: Apply tc3589x\u0027s GPIO/IRQ properties to HREF\u0027s DT\n ARM: ux500: Remove redundant #gpio-cell properties from Snowball DT\n ARM: ux500: Add all encompassing sound node to the HREF Device Tree\n ...\n" }, { "commit": "11801e9de26992d37cb869cc74f389b6a7677e0e", "tree": "322b7ea2b475d52da27d3e01f5bc2992bb708d59", "parents": [ "1a58ddfc0fcf3d83a92573c71771962f9b218993", "b6e3b5c2fea9c76617e101cbbc54ed14961f9dee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:24:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:24:44 2012 -0700" }, "message": "Merge tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM soc-specific updates from Olof Johansson:\n \"Most notable here is probably the addition of basic support for the\n BCM2835, an SoC used in some of the Roku 2 players as well as the\n much-hyped Raspberry Pi, cleaned up and contributed by Stephen Warren.\n It\u0027s still early days on mainline support, with just the basics\n working. But it has to start somewhere!\n\n Beyond that there\u0027s some conversions of clock infrastructure on tegra\n to common clock, misc updates for several other platforms, and OMAP\n now has its own bus (under drivers/bus) to manage its devices through.\n\n This branch adds two new directories outside of arch/arm:\n drivers/irqchip for new irq controllers, and drivers/bus for the above\n OMAP bus. It\u0027s expected that some of the other platforms will migrate\n parts of their platforms to those directories over time as well.\"\n\nFix up trivial conflicts with the clk infrastructure changes.\n\n* tag \u0027soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (62 commits)\n ARM: shmobile: add new __iomem annotation for new code\n ARM: LPC32xx: Support GPI 28\n ARM: LPC32xx: Platform update for devicetree completion of spi-pl022\n ARM: LPC32xx: Board cleanup\n irqchip: fill in empty Kconfig\n ARM: SAMSUNG: Add check for NULL in clock interface\n ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state\n ARM: EXYNOS: Add bus clock for FIMD\n ARM: SAMSUNG: Fix HDMI related warnings\n ARM: S3C24XX: Add .get_rate callback for \"camif-upll\" clock\n ARM: EXYNOS: Fix incorrect help text\n ARM: EXYNOS: Turn off clocks for NAND, OneNAND and TSI controllers\n ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move\n MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture\n ARM: bcm2835: instantiate console UART\n ARM: bcm2835: add stub clock driver\n ARM: bcm2835: add system timer\n ARM: bcm2835: add interrupt controller driver\n ARM: add infra-structure for BCM2835 and Raspberry Pi\n ARM: tegra20: add CPU hotplug support\n ...\n" }, { "commit": "61464c8357c8f6b780e4c44f5c79471799c51ca7", "tree": "4509cf075403965528f380f2f825c46908fb7d4e", "parents": [ "47061eda2584b9e4516d1e3a9713406a3a559ac8", "9cf1c871526cf6bfec2a653e1e068ee72592542c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:19:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:19:05 2012 -0700" }, "message": "Merge tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM soc general cleanups from Olof Johansson:\n \"This is a large branch that contains a handful of different cleanups:\n\n - Fixing up the I/O space remapping on PCI on ARM. This is a series\n from Rob Herring that restructures how all pci devices allocate I/O\n space, and it\u0027s part of the work to allow multiplatform kernels.\n - A number of cleanup series for OMAP, moving and removing some\n headers, sparse irq rework and in general preparation for\n multiplatform.\n - Final removal of all non-DT boards for Tegra, it is now\n device-tree-only!\n - Removal of a stale platform, nxp4008. It\u0027s an old mobile chipset\n that is no longer in use, and was very likely never really used\n with a mainline kernel. We have not been able to find anyone\n interested in keeping it around in the kernel.\n - Removal of the legacy dmaengine driver on tegra\n\n + A handful of other things that I haven\u0027t described above.\"\n\nFix up some conflicts with the staging tree (and because nxp4008 was\nremoved)\n\n* tag \u0027cleanup\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)\n ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6\n ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus\n ARM: mmp: using for_each_set_bit to simplify the code\n ARM: tegra: harmony: fix ldo7 regulator-name\n ARM: OMAP2+: Make omap4-keypad.h local\n ARM: OMAP2+: Make l4_3xxx.h local\n ARM: OMAP2+: Make l4_2xxx.h local\n ARM: OMAP2+: Make l3_3xxx.h local\n ARM: OMAP2+: Make l3_2xxx.h local\n ARM: OMAP1: Move irda.h from plat to mach\n ARM: OMAP2+: Make hdq1w.h local\n ARM: OMAP2+: Make gpmc-smsc911x.h local\n ARM: OMAP2+: Make gpmc-smc91x.h local\n ARM: OMAP1: Move flash.h from plat to mach\n ARM: OMAP2+: Make debug-devices.h local\n ARM: OMAP1: Move board-voiceblue.h from plat to mach\n ARM: OMAP1: Move board-sx1.h from plat to mach\n ARM: OMAP2+: Make omap-wakeupgen.h local\n ARM: OMAP2+: Make omap-secure.h local\n ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local\n ...\n" }, { "commit": "47061eda2584b9e4516d1e3a9713406a3a559ac8", "tree": "eead6cf96696e6eb0abf7cc7a3f6ee27aefc7c3b", "parents": [ "797b9e5ae93270ec27a1f1ed48cd697d01b2269f", "b10dcdcac43b2b5adf800a19f782fef38ada75a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:02:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 18:02:07 2012 -0700" }, "message": "Merge tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull non-critical ARM soc bug fixes from Olof Johansson:\n \"These were submitted as bug fixes before v3.6 but not considered\n important enough to be included in it. Some of them cross over to\n cleanup territory as well, and aren\u0027t strictly bugfixes.\"\n\n* tag \u0027fixes-non-critical\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)\n ARM: nomadik: remove NAND_NO_READRDY use\n ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()\n ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()\n ARM: S3C24XX: removes unnecessary semicolon\n ARM: S3C24xx: delete double assignment\n ARM: EXYNOS: fix address for EXYNOS4 MDMA1\n ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name\n ARM: ep93xx: Move ts72xx.h out of include/mach\n ARM: ep93xx: use __iomem pointers for MMIO\n ARM: msm: Fix early debug uart mapping on some memory configs\n ARM: msm: io: Change the default static iomappings to be shared\n ARM: msm: io: Remove 7x30 iomap region from 7x00\n ARM: msm: Remove call to missing FPGA init on 8660\n ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write\n ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save\n dma: tegra: make data used as *of_device_id.data const\n can: mpc5xxx_can: make data used as *of_device_id.data const\n macintosh/mediabay: make data used as *of_device_id.data const\n i2c/mpc: make data used as *of_device_id.data const\n mfd/da9052: make i2c_device_id array const\n ...\n" }, { "commit": "6ac7ef1487a040483d89a95045efc5185a71268f", "tree": "4543fbc8a4ac5f7c823337f15642898e2f5ac881", "parents": [ "9e0f9a10576a7769869ce1f76f5b336da20667a6" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Aug 24 20:12:20 2012 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Oct 02 01:58:42 2012 +0100" }, "message": "sfc: Fix the reported priorities of different filter types\n\nEach RX filter table contains filters with two different levels of\nspecificity: TCP/IPv4 and UDP/IPv4 filters match the local address and\nport and optionally the remote address and port; Ethernet filters\nmatch the local address and optionally the VID. The more specific\nfilters always override less specific filters within the same table,\nand should be numbered accordingly.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "9e0f9a10576a7769869ce1f76f5b336da20667a6", "tree": "76be46bf82a681f2a1a838a55025e4567e620224", "parents": [ "1ac0226eb04e56cacee080fb71938eb50b5245eb" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Sep 04 18:57:25 2012 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Oct 02 01:58:41 2012 +0100" }, "message": "sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP\n\nThis filter flag cannot yet be set through the ethtool command and\nwill not be supported on future hardware.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "1ac0226eb04e56cacee080fb71938eb50b5245eb", "tree": "b48353aaad1bbd35211aaff02d5630299b50776d", "parents": [ "0a6e5008a9df678b48f8d4e57601aa4270df6c14" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Sep 13 02:22:52 2012 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Oct 02 01:58:41 2012 +0100" }, "message": "sfc: Fix loopback self-test with separate_tx_channels\u003d1\n\nThe loopback self-test iterates over all the TX queues of channel 0,\nwhich is not very interesting when that\u0027s an RX-only channel.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflre.com\u003e\n" }, { "commit": "0a6e5008a9df678b48f8d4e57601aa4270df6c14", "tree": "42b1fdd0cee106cbbca7ba0fa20503255a90b800", "parents": [ "9724a8504c875145f5a513bb8eca50671cee23b4" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Sep 11 21:46:41 2012 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Oct 02 01:58:40 2012 +0100" }, "message": "sfc: Fix MCDI structure field lookup\n\nThe least significant bit number (LBN) of a field within an MCDI\nstructure is counted from the start of the structure, not the\ncontaining dword. In MCDI_ARRAY_FIELD() we need to mask it rather\nthan using the usual EFX_DWORD_FIELD() macro.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "9724a8504c875145f5a513bb8eca50671cee23b4", "tree": "3d1cc1ed4a3c836906c092c9834f3339693b4be1", "parents": [ "726ba0e14a7915effee9e8e652a37306d9637d13" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Sep 11 21:37:36 2012 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Oct 02 01:58:39 2012 +0100" }, "message": "sfc: Add parentheses around use of bitfield macro arguments\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "726ba0e14a7915effee9e8e652a37306d9637d13", "tree": "53765b1e20c178fcf762c9263746752121ec2405", "parents": [ "abb17e6c0c7b27693201dc85f75dbb184279fd10" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Oct 02 01:43:45 2012 +0100" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Oct 02 01:57:25 2012 +0100" }, "message": "sfc: Fix null function pointer in efx_sriov_channel_type\n\nCommit c31e5f9 (\u0027sfc: Add channel specific receive_skb handler and\npost_remove callback\u0027) added the function pointer field\nefx_channel_type::post_remove and an unconditional call through it.\n\nThis field should have been initialised to efx_channel_dummy_op_void\nin the existing instances of efx_channel_type, but this was only done\nin efx_default_channel_type. Consequently, if a device has SR-IOV\nenabled then removing the driver or device will result in an oops.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "d342894c5d2f8c7df194c793ec4059656e09ca31", "tree": "13dec930ffdfa590c869488203584ea0c6b5cf7c", "parents": [ "193ba924524e6afe192217982b2c2d67e4715d33" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 01 12:32:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 18:39:45 2012 -0400" }, "message": "vxlan: virtual extensible lan\n\nThis is an implementation of Virtual eXtensible Local Area Network\nas described in draft RFC:\n http://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-02\n\nThe driver integrates a Virtual Tunnel Endpoint (VTEP) functionality\nthat learns MAC to IP address mapping.\n\nThis implementation has not been tested only against the Linux\nuserspace implementation using TAP, not against other vendor\u0027s\nequipment.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edc7d57327bd08bfd04f41531d49b176369db218", "tree": "c1005cd5c5e9006c4eb2de39b3d14598f2206892", "parents": [ "de0a41484c47d783dd4d442914815076aa2caac2" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 01 12:32:33 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 18:39:44 2012 -0400" }, "message": "netlink: add attributes to fdb interface\n\nLater changes need to be able to refer to neighbour attributes\nwhen doing fdb_add.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de0a41484c47d783dd4d442914815076aa2caac2", "tree": "b789a2930a3d4e3c1cfc555ec082d812453feea5", "parents": [ "d4e62648274857a2b3a5bc62f910c062e71b2d9b" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 01 11:43:49 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 18:07:39 2012 -0400" }, "message": "tg3: unconditionally select HWMON support when tg3 is enabled.\n\nThere is the seldom used corner case where HWMON\u003dm at the same\ntime as TIGON3\u003dy (typically randconfigs) which will cause a link\nfail like:\n\ndrivers/built-in.o: In function `tg3_close\u0027:\ntg3.c:(.text+0x16bd86): undefined reference to `hwmon_device_unregister\u0027\ndrivers/built-in.o: In function `tg3_hwmon_open\u0027:\ntg3.c:(.text+0x16fc4b): undefined reference to `hwmon_device_register\u0027\nmake[1]: *** [vmlinux] Error 1\n\nFix it as suggested by DaveM[1] by having the Kconfig logic simply\nselect HWMON when TIGON3 is selected. This gets rid of all the\nextra IS_ENABLED ifdeffery in tg3.c as a side benefit.\n\n[1] http://marc.info/?l\u003dlinux-netdev\u0026m\u003d134250573718151\u0026w\u003d2\n\nCc: Michael Chan \u003cmchan@broadcom.com\u003e\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReported-by: Anisse Astier \u003canisse@astier.eu\u003e\nSuggested-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d4e62648274857a2b3a5bc62f910c062e71b2d9b", "tree": "577ae52418806cbc94d16fde5fe6197b16d7b13f", "parents": [ "9fbef059d63cbc3249a3ddfd9a12cb511c8be55e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:39:31 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:39:31 2012 -0400" }, "message": "Revert \"net: ti cpsw ethernet: allow reading phy interface mode from DT\"\n\nThis reverts commit d7559982701ac500662b2e8e150ff34f7faf0281.\n\nIt wasn\u0027t meant to be applied, commit\n342b7b741d76bc8aadeff844634348bb2a343d19 (\"net: ti cpsw ethernet: set\nIFCTL_A bit in MACCONTROL\") was redone in such a way to make this\ncommit unnecessary.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66dc81ecd71332783c92fb170950d5ddb43da461", "tree": "6211721065598aacb057a27ecb1c577c89609402", "parents": [ "4f72e5f00dea3eca9139a23cf70fbf18d62fd1db" ], "author": { "name": "Quinlan Pfiffer", "email": "qpfiffer@gmail.com", "time": "Fri Sep 28 19:58:44 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:33:00 2012 -0400" }, "message": "asix: Adds support for Lenovo 10/100 USB dongle.\n\nThis dongle ships with the X1 Carbon, and has an AX88772B\nusb to ethernet chip in it.\n\nSigned-off-by: Quinlan Pfiffer \u003cqpfiffer@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dde3ada3d0069855eeb353707b2b0f946191cfd6", "tree": "bdc2d358f8dc7fc29000149ebc4db949934b15b2", "parents": [ "5e056ef4ddeb6129f6bb170f2c26b8f370bbcda7", "fb4f552e895cec29934d94a99cbd1f1f00448a88" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Oct 01 14:20:58 2012 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Oct 01 14:20:58 2012 -0700" }, "message": "Merge branch \u0027next\u0027 into for-linus\n\nPrepare first set of updates for 3.7 merge window.\n" }, { "commit": "4f72e5f00dea3eca9139a23cf70fbf18d62fd1db", "tree": "d14d7292b719fb92de48e7e79590d650e0e092eb", "parents": [ "f674e72ff1aad23a99c7c205473cf02c85c2ac33" ], "author": { "name": "Wolfgang Grandegger", "email": "wg@grandegger.com", "time": "Fri Sep 28 03:17:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:18:21 2012 -0400" }, "message": "flexcan: disable bus error interrupts for the i.MX28\n\nDue to a bug in most Flexcan cores, the bus error interrupt needs\nto be enabled. Otherwise we don\u0027t get any error warning or passive\ninterrupts. This is _not_ necessary for the i.MX28 and this patch\ndisables bus error interrupts if \"berr-reporting\" is not requested.\nThis avoids bus error flooding, which might harm, especially on\nlow-end systems.\n\nTo handle such quirks of the Flexcan cores, a hardware feature flag\nhas been introduced, also replacing the \"hw_ver\" variable. So far\nnobody could tell what Flexcan core version is available on what\nFreescale SOC, apart from the i.MX6Q and P1010, and which bugs or\nfeatures are present on the various \"hw_rev\".\n\nCC: Hui Wang \u003cjason77.wang@gmail.com\u003e\nCC: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "862096a8bbf8f992f6d0a1a8786ffd3fc7437e48", "tree": "6126e2ac9400db959b1a9c075092565401d91db5", "parents": [ "d7559982701ac500662b2e8e150ff34f7faf0281" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Thu Sep 27 12:06:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:12:22 2012 -0400" }, "message": "IB/ipoib: Add more rtnl_link_ops callbacks\n\nAdd the rtnl_link_ops changelink and fill_info callbacks, through\nwhich the admin can now set/get the driver mode, etc policies.\nMaintain the proprietary sysfs entries only for legacy childs.\n\nFor child devices, set dev-\u003eiflink to point to the parent\ndevice ifindex, such that user space tools can now correctly\nshow the uplink relation as done for vlan, macvlan, etc\ndevices. Pointed out by Patrick McHardy \u003ckaber@trash.net\u003e\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7559982701ac500662b2e8e150ff34f7faf0281", "tree": "cd731653972e45649b1b13bb1b82d9602c152208", "parents": [ "342b7b741d76bc8aadeff844634348bb2a343d19" ], "author": { "name": "Daniel Mack", "email": "zonque@gmail.com", "time": "Wed Sep 26 07:24:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:10:55 2012 -0400" }, "message": "net: ti cpsw ethernet: allow reading phy interface mode from DT\n\nAllow users to specify the phy interface of the CPSW slaves. The new\nnode parameter is called \"phy_if_mode\" and is optional. The original\nbehaviour of the driver is preserved when not given.\n\nSigned-off-by: Daniel Mack \u003czonque@gmail.com\u003e\nCc: Mugunthan V N \u003cmugunthanvnm@ti.com\u003e\nCc: Vaibhav Hiremath \u003chvaibhav@ti.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "342b7b741d76bc8aadeff844634348bb2a343d19", "tree": "de68d9aea359b8f2a315a02896ca2457a7b627bb", "parents": [ "8112ec3b8722680251aecdcc23dfd81aa7af6340" ], "author": { "name": "Daniel Mack", "email": "zonque@gmail.com", "time": "Thu Sep 27 09:19:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:09:07 2012 -0400" }, "message": "net: ti cpsw ethernet: set IFCTL_A bit in MACCONTROL\n\nFor RMII/RGMII mode operation in 100Mbps, the CPSW needs to set the\nIFCTL_A bits in the MACCONTROL register. For all other PHY modes, this\nbit is unused, so setting it unconditionally shouldn\u0027t cause any\ntrouble.\n\nSigned-off-by: Daniel Mack \u003czonque@gmail.com\u003e\nCc: Mugunthan V N \u003cmugunthanvnm@ti.com\u003e\nCc: Vaibhav Hiremath \u003chvaibhav@ti.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8112ec3b8722680251aecdcc23dfd81aa7af6340", "tree": "29c45d88297bc0e21b1716426f9a048e7d783707", "parents": [ "60769a5dcd8755715c7143b4571d5c44f01796f1" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Fri Sep 28 07:53:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 17:01:57 2012 -0400" }, "message": "mlx4: dont orphan skbs in mlx4_en_xmit()\n\nAfter commit e22979d96a55d (mlx4_en: Moving to Interrupts for TX\ncompletions) we no longer need to orphan skbs in mlx4_en_xmit()\nsince skb wont stay a long time in TX ring before their release.\n\nOrphaning skbs in ndo_start_xmit() should be avoided as much as\npossible, since it breaks TCP Small Queue or other flow control\nmechanisms (per socket limits)\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nAcked-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.com\u003e\nCc: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc150a2861e744d8f574d571762cc7e9f928abb3", "tree": "a1567d76fc52dc56ba483d7dafa82fada5fc28ba", "parents": [ "d9a807461fc8cc0d6ba589ea0730d139122af012", "592758b12f2e327bb5902dabd3d36b2e86049871" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 13:50:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 13:50:06 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon updates from Guenter Roeck:\n \"New drivers for: MCP3221, ADT7410, MAX197\n\n Chip support added to existing drivers: LM71, LM74, MAX1110, MAX1112,\n MAX1113, INA220, INA230, MCP3221\n\n Cleanup: Use devm_ functions, fixed build warnings, removed deprecated\n sysfs attributes, code simplifications, dropped dependencies on\n EXPERIMENTAL\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (64 commits)\n hwmon: (mcp3021) Add MCP3221 support\n hwmon: (mcp3021) Prepare MCP3021 driver to support other chips\n hwmon: (w83791d) Drop unnecessary compare statements\n hwmon: (lm93) Drop unnecessary compare statement\n hwmon: (lm70) Simplify show_name function\n hwmon: (adcxx) Simplify show_name function\n hwmon: Drop dependencies on EXPERIMENTAL\n hwmon: (it87) Fix Kconfig for IT87 driver\n hwmon: (sht15) move header to linux/platform_data/\n hwmon: (asus_atk0110) Remove useless kfree\n hwmon: (ina2xx) Add support for INA220 and INA230\n hwmon: (ina2xx) Use structure array to distinguish chip types\n hwmon: (max1111) Add support for MAX1110, MAX1112, and MAX1113\n hwmon: (lm70) Add support for LM71 and LM74\n hwmon: (Documentation) Update feature-removal-schedule.txt\n hwmon: (w83793) Remove legacy chassis intrusion detection sysfs attributes\n hwmon: (w83792d) Remove legacy chassis intrusion detection attributes\n hwmon: (adm9240) Remove legacy chassis intrusion detection sysfs attribute\n hwmon: (lm70) Allow 4wire SPI bus with LM70\n hwmon: (sht15) remove multiple driver registration\n ...\n" }, { "commit": "515e12401f43f2fe7511d228dfe3e186be8aab6e", "tree": "7589f8ea9833e9d3988b9ec229aaeade175b5461", "parents": [ "96bed4b954fd5ef69e32f3c1d2c7c6bdda181316" ], "author": { "name": "Yuval Mintz", "email": "yuvalmin@broadcom.com", "time": "Mon Oct 01 03:46:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 16:43:17 2012 -0400" }, "message": "bnx2x: update version to 1.78.00-0.\n\nSigned-off-by: Yuval Mintz \u003cyuvalmin@broadcom.com\u003e\nSigned-off-by: Ariel Elior \u003cariele@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "96bed4b954fd5ef69e32f3c1d2c7c6bdda181316", "tree": "3c98025e66edbfd135d2e08c55e128ed660ab0c3", "parents": [ "2f6a02604e962295569749913081365ec9ec1372" ], "author": { "name": "Yuval Mintz", "email": "yuvalmin@broadcom.com", "time": "Mon Oct 01 03:46:19 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 16:43:17 2012 -0400" }, "message": "bnx2x,cnic: use FW 7.8.2\n\nThis patch moves the bnx2x and cnic drivers into using FW 7.8.2\nwhich was recently submitted into the linux-firmware tree.\n\nA short summary of minor bugs fixed by this FW:\n 1. In switch dependent mode, fix several issues regarding inner vlan\n vs. DCB priorities.\n 2. iSCSI - not all packets were completed on a forward channel.\n 3. DCB - fixed for 4-port devices.\n 4. Fixed false parity reported in CAM memories when operating near -5%\n on the 1.0V core supply.\n 5. ETS default settings are set to fairness between traffic classes\n (rather than strict priority), and uses the same chip receive buffer\n configuration for both PFC and pause.\n\nFor a complete list of fixes made by this FW, see commit 236367db\nin the linux-firmware git repository.\n\nSigned-off-by: Yuval Mintz \u003cyuvalmin@broadcom.com\u003e\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Ariel Elior \u003cariele@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f6a02604e962295569749913081365ec9ec1372", "tree": "199ae83acd27e6f007f7230644d3b6b0b3556bd7", "parents": [ "f4b549a5ac818722fc13d789584f41f4e00d78b5" ], "author": { "name": "Ivan Vecera", "email": "ivecera@redhat.com", "time": "Mon Oct 01 01:56:55 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 01 16:43:17 2012 -0400" }, "message": "be2net: fix vfs enumeration\n\nCurrent VFs enumeration algorithm used in be_find_vfs does not take domain\nnumber into the match. The match found in igb/ixgbe is more elegant and\nsafe.\n\nThis 2nd version uses pci_physfn instead of checking dev-\u003ephysfn directly.\n\nSigned-off-by: Ivan Vecera \u003civecera@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d9a807461fc8cc0d6ba589ea0730d139122af012", "tree": "9d8c7a044659d821748dd40718a22557c04e4299", "parents": [ "3498d13b8090c0b0ef911409fbc503a7c4cca6ef", "70c048a238c780c226eb4b115ebaa908cb3b34ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 13:23:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 13:23:01 2012 -0700" }, "message": "Merge tag \u0027usb-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB changes from Greg Kroah-Hartman:\n \"Here is the big USB pull request for 3.7-rc1\n\n There are lots of gadget driver changes (including copying a bunch of\n files into the drivers/staging/ccg/ directory so that the other gadget\n drivers can be fixed up properly without breaking that driver), and we\n remove the old obsolete ub.c driver from the tree.\n\n There are also the usual XHCI set of updates, and other various driver\n changes and updates. We also are trying hard to remove the old dbg()\n macro, but the final bits of that removal will be coming in through\n the networking tree before we can delete it for good.\n\n All of these patches have been in the linux-next tree.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFix up several annoying - but fairly mindless - conflicts due to the\ntermios structure having moved into the tty device, and often clashing\nwith dbg -\u003e dev_dbg conversion.\n\n* tag \u0027usb-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits)\n USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc\n USB: uas: fix gcc warning\n USB: uas: fix locking\n USB: Fix race condition when removing host controllers\n USB: uas: add locking\n USB: uas: fix abort\n USB: uas: remove aborted field, replace with status bit.\n USB: uas: fix task management\n USB: uas: keep track of command urbs\n xhci: Intel Panther Point BEI quirk.\n powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY\n USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support\n Revert \"usb : Add sysfs files to control port power.\"\n USB: serial: remove vizzini driver\n usb: host: xhci: Fix Null pointer dereferencing with 71c731a for non-x86 systems\n Increase XHCI suspend timeout to 16ms\n USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq\n USB: sierra_ms: don\u0027t keep unused variable\n fsl/usb: Add support for USB controller version 2.4\n USB: qcaux: add Pantech vendor class match\n ...\n" }, { "commit": "3498d13b8090c0b0ef911409fbc503a7c4cca6ef", "tree": "254ca00276e863d9fba25707690c66b2a04c49e9", "parents": [ "def7cb8cd4e3258db88050eaaca5438bcc3dafca", "0c57dfcc6c1d037243c2f8fbf62eab3633326ec0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:26:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:26:52 2012 -0700" }, "message": "Merge tag \u0027tty-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY changes from Greg Kroah-Hartman:\n \"As we skipped the merge window for 3.6-rc1 for the tty tree,\n everything is now settled down and working properly, so we are ready\n for 3.7-rc1. Here\u0027s the patchset, it\u0027s big, but the large changes are\n removing a firmware file and adding a staging tty driver (it depended\n on the tty core changes, so it\u0027s going through this tree instead of\n the staging tree.)\n\n All of these patches have been in the linux-next tree for a while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\nFix up more-or-less trivial conflicts in\n - drivers/char/pcmcia/synclink_cs.c:\n tty NULL dereference fix vs tty_port_cts_enabled() helper function\n - drivers/staging/{Kconfig,Makefile}:\n add-add conflict (dgrp driver added close to other staging drivers)\n - drivers/staging/ipack/devices/ipoctal.c:\n \"split ipoctal_channel from iopctal\" vs \"TTY: use tty_port_register_device\"\n\n* tag \u0027tty-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)\n tty/serial: Add kgdb_nmi driver\n tty/serial/amba-pl011: Quiesce interrupts in poll_get_char\n tty/serial/amba-pl011: Implement poll_init callback\n tty/serial/core: Introduce poll_init callback\n kdb: Turn KGDB_KDB\u003dn stubs into static inlines\n kdb: Implement disable_nmi command\n kernel/debug: Mask KGDB NMI upon entry\n serial: pl011: handle corruption at high clock speeds\n serial: sccnxp: Make \u0027default\u0027 choice in switch last\n serial: sccnxp: Remove mask termios caps for SW flow control\n serial: sccnxp: Report actual baudrate back to core\n serial: samsung: Add poll_get_char \u0026 poll_put_char\n Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate\n Powerpc 8xx CPM_UART maxidl should not depend on fifo size\n Powerpc 8xx CPM_UART too many interrupts\n Powerpc 8xx CPM_UART desynchronisation\n serial: set correct baud_base for EXSYS EX-41092 Dual 16950\n serial: omap: fix the reciever line error case\n 8250: blacklist Winbond CIR port\n 8250_pnp: do pnp probe before legacy probe\n ...\n" }, { "commit": "def7cb8cd4e3258db88050eaaca5438bcc3dafca", "tree": "23fcf90ddc98acec07bb115c2f7740c21cf44a84", "parents": [ "06d2fe153b9b35e57221e35831a26918f462db68", "e1878957b4676a17cf398f7f5723b365e9a2ca48" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:11:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:11:39 2012 -0700" }, "message": "Merge tag \u0027staging-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree update from Greg Kroah-Hartman:\n \"Here is the big staging tree update for the 3.7-rc1 merge window.\n\n There are a few patches in here that are outside of the staging area,\n namely HID and IIO patches, but all of them have been acked by the\n relevant subsystem maintainers. The IIO stuff is still coming in\n through this tree as it hasn\u0027t entirely moved out of the staging tree,\n but is almost there.\n\n Other than that, there wa a ton of work on the comedi drivers to make\n them more readable and the correct style. Doing that removed a lot of\n code, but we added a new driver to the staging tree, so we didn\u0027t end\n up with a net reduction this time around:\n\n 662 files changed, 51649 insertions(+), 26582 deletions(-)\n\n All of these patches have been in the linux-next tree already.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027staging-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1094 commits)\n staging: comedi: jr3_pci: fix iomem dereference\n staging: comedi: drivers: use comedi_fc.h cmdtest helpers\n Staging: winbond: usb_free_urb(NULL) is safe\n Staging: winbond: checkpatch cleanup\n Staging: winbond: Removed undesired spaces, lines and tabs\n Staging: winbond: Typo corrections in comments\n Staging: winbond: Changed c99 comments to c89 comments\n staging: r8712u: Do not queue cloned skb\n staging: comedi: ni_mio_common: always lock in ni_ai_poll()\n staging: comedi: s626: add FIXME comment\n staging: comedi: s626: don\u0027t dereference insn-\u003edata\n staging: comedi: s526: fix if() check in s526_gpct_winsn()\n staging: comedi: s626: cleanup comments in s626_initialize()\n staging: comedi: s626: remove clear of kzalloc\u0027ed data\n staging: comedi: s626: remove \u0027WDInterval\u0027 from private data\n staging: comedi: s626: remove \u0027ChargeEnabled\u0027 from private data\n staging: comedi: s626: remove \u0027IsBoardRevA\u0027 comment\n staging: comedi: s626: #if 0 out the \"SAA7146 BUG WORKAROUND\"\n staging: comedi: s626: remove \u0027allocatedBuf\u0027 from private data\n staging: comedi: s626: add final attach message\n ...\n" }, { "commit": "06d2fe153b9b35e57221e35831a26918f462db68", "tree": "f77cb72dfba7f2a47ceb93e120abd9399a24a1b9", "parents": [ "3aebd34b1200a902a8662da8845824a02f00772e", "e0f21e6d52cc245e7d4f7e02ca4b7b6571660ec2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:10:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:10:44 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core merge from Greg Kroah-Hartman:\n \"Here is the big driver core update for 3.7-rc1.\n\n A number of firmware_class.c updates (as you saw a month or so ago),\n and some hyper-v updates and some printk fixes as well. All patches\n that are outside of the drivers/base area have been acked by the\n respective maintainers, and have all been in the linux-next tree for a\n while.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027driver-core-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (95 commits)\n memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()\n device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit\n memory: emif: Add ifdef CONFIG_DEBUG_FS guard for emif_debugfs_[init|exit]\n Documentation: Fixes some translation error in Documentation/zh_CN/gpio.txt\n Documentation: Remove 3 byte redundant code at the head of the Documentation/zh_CN/arm/booting\n Documentation: Chinese translation of Documentation/video4linux/omap3isp.txt\n device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emit\n dev: Add dev_vprintk_emit and dev_printk_emit\n netdev_printk/netif_printk: Remove a superfluous logging colon\n netdev_printk/dynamic_netdev_dbg: Directly call printk_emit\n dev_dbg/dynamic_debug: Update to use printk_emit, optimize stack\n driver-core: Shut up dev_dbg_reatelimited() without DEBUG\n tools/hv: Parse /etc/os-release\n tools/hv: Check for read/write errors\n tools/hv: Fix exit() error code\n tools/hv: Fix file handle leak\n Tools: hv: Implement the KVP verb - KVP_OP_GET_IP_INFO\n Tools: hv: Rename the function kvp_get_ip_address()\n Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO\n Tools: hv: Add an example script to configure an interface\n ...\n" }, { "commit": "3aebd34b1200a902a8662da8845824a02f00772e", "tree": "13eac224dc1ac40be53bccc90f27bebf2e619c26", "parents": [ "2c0c86d5b67ee04e8b71a2ea2a3af6d224611cfc", "5dc2db05f2f690d71d95979b14cca50ab8e49f40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:09:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:09:59 2012 -0700" }, "message": "Merge tag \u0027char-misc-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull char/misc driver merge from Greg Kroah-Hartman:\n \"Here is the \"big\" char/misc driver tree update for the 3.7-rc1 merge\n window.\n\n Nothing major, just a number of driver updates and fixes, all of which\n have been in the linux-next releases for a while now either in my\n tree, or in Andrew\u0027s (the lis3l driver changes came from his tree last\n week).\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027char-misc-3.6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (52 commits)\n drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init\n drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init\n drivers/misc/lis3lv02d: remove lis3lv02d driver DT init\n drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code\n drivers/misc/lis3lv02d: add generic DT matching code\n lis3lv02d: fix some comments specific to lis331dlh driver\n MISC: hpilo, remove pci_disable_device\n pcmcia: synclink_cs: fix potential tty NULL dereference\n drivers/char/mmtimer.c: Remove useless kfree\n drivers/char: removes unnecessary semicolon\n char/misc: remove CONFIG_EXPERIMENTAL dependencies\n mei: don\u0027t print buffer as a string\n mei: struct mei_message_data doesn\u0027t have to be packed\n mei: add error messages for open count errors\n misc: use module_spi_driver\n tifm: use module_pci_driver\n misc/at25, dt: Improve at25 SPI eeprom device tree bindings.\n mei: add lynx point pci device ids\n mei: fix max number of open handles\n mei: rename struct pci_dev *mei_device to mei_pdev\n ...\n" }, { "commit": "2c0c86d5b67ee04e8b71a2ea2a3af6d224611cfc", "tree": "84cb3b96e68be80b3e8b6876b27fc9ff6ba0370f", "parents": [ "fdb2f9c2ebd4f07d7b11a3bc86d8c669eb841697", "494bfec99922d54054d2d0873f1017680cfc3f13" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:09:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:09:04 2012 -0700" }, "message": "Merge tag \u0027clk-for-linus\u0027 of git://git.linaro.org/people/mturquette/linux\n\nPull clk framework update from Michael Turquette:\n \"The common clk framework changes for 3.7 are dominated by ARM platform\n ports to the framework along with one MIPS port, one MFD port, one\n minor framework enhancement and one helper function for platforms\n expressing their clock data through device tree.\"\n\n* tag \u0027clk-for-linus\u0027 of git://git.linaro.org/people/mturquette/linux:\n clk: add of_clk_src_onecell_get() support\n clk: ux500: Define smp_twd clock for u8500\n mfd: dbx500: Provide a more accurate smp_twd clock\n clk: ux500: Support for prmcu_rate clock\n clk: Provide option for clk_get_rate to issue hw for new rate\n clock: max77686: Add driver for Maxim 77686 32Khz crystal oscillator.\n ARM: ux500: Switch to use common clock framework\n clk: ux500: Clock definitions for u8500\n clk: ux500: First version of clock definitions for ux500\n clk: ux500: Adapt PRCMU and PRCC clocks for common clk\n clk: versatile: make config option boolean\n clk: add Loongson1B clock support\n arm: mmp: make all SOCs use common clock by default\n clk: mmp: add clock definition for mmp2\n clk: mmp: add clock definition for pxa910\n clk: mmp: add clock definition for pxa168\n clk: mmp: add mmp specific clocks\n clk: convert ARM RealView to common clk\n clk: prima2: move from arch/arm/mach to drivers/clk\n ARM: PRIMA2: convert to common clk and finish full clk tree\n" }, { "commit": "fdb2f9c2ebd4f07d7b11a3bc86d8c669eb841697", "tree": "d85824518fc13a8c84b7399019fc11ad77aaa120", "parents": [ "81f56e5375e84689b891e0e6c5a02ec12a1f18d9", "78c8f84302ce007aedcfa11912fd4aacf22727ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:05:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 12:05:36 2012 -0700" }, "message": "Merge tag \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI changes from Bjorn Helgaas:\n \"Host bridge hotplug\n - Protect acpi_pci_drivers and acpi_pci_roots (Taku Izumi)\n - Clear host bridge resource info to avoid issue when releasing\n (Yinghai Lu)\n - Notify acpi_pci_drivers when hot-plugging host bridges (Jiang Liu)\n - Use standard list ops for acpi_pci_drivers (Jiang Liu)\n\n Device hotplug\n - Use pci_get_domain_bus_and_slot() to close hotplug races (Jiang\n Liu)\n - Remove fakephp driver (Bjorn Helgaas)\n - Fix VGA ref count in hotplug remove path (Yinghai Lu)\n - Allow acpiphp to handle PCIe ports without native hotplug (Jiang\n Liu)\n - Implement resume regardless of pciehp_force param (Oliver Neukum)\n - Make pci_fixup_irqs() work after init (Thierry Reding)\n\n Miscellaneous\n - Add pci_pcie_type(dev) and remove pci_dev.pcie_type (Yijing Wang)\n - Factor out PCI Express Capability accessors (Jiang Liu)\n - Add pcibios_window_alignment() so powerpc EEH can use generic\n resource assignment (Gavin Shan)\n - Make pci_error_handlers const (Stephen Hemminger)\n - Cleanup drivers/pci/remove.c (Bjorn Helgaas)\n - Improve Vendor-Specific Extended Capability support (Bjorn\n Helgaas)\n - Use standard list ops for bus-\u003edevices (Bjorn Helgaas)\n - Avoid kmalloc in pci_get_subsys() and pci_get_class() (Feng Tang)\n - Reassign invalid bus number ranges (Intel DP43BF workaround)\n (Yinghai Lu)\"\n\n* tag \u0027for-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (102 commits)\n PCI: acpiphp: Handle PCIe ports without native hotplug capability\n PCI/ACPI: Use acpi_driver_data() rather than searching acpi_pci_roots\n PCI/ACPI: Protect acpi_pci_roots list with mutex\n PCI/ACPI: Use acpi_pci_root info rather than looking it up again\n PCI/ACPI: Pass acpi_pci_root to acpi_pci_drivers\u0027 add/remove interface\n PCI/ACPI: Protect acpi_pci_drivers list with mutex\n PCI/ACPI: Notify acpi_pci_drivers when hot-plugging PCI root bridges\n PCI/ACPI: Use normal list for struct acpi_pci_driver\n PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots\n PCI: Fix default vga ref_count\n ia64/PCI: Clear host bridge aperture struct resource\n x86/PCI: Clear host bridge aperture struct resource\n PCI: Stop all children first, before removing all children\n Revert \"PCI: Use hotplug-safe pci_get_domain_bus_and_slot()\"\n PCI: Provide a default pcibios_update_irq()\n PCI: Discard __init annotations for pci_fixup_irqs() and related functions\n PCI: Use correct type when freeing bus resource list\n PCI: Check P2P bridge for invalid secondary/subordinate range\n PCI: Convert \"new_id\"/\"remove_id\" into generic pci_bus driver attributes\n xen-pcifront: Use hotplug-safe pci_get_domain_bus_and_slot()\n ...\n" }, { "commit": "81f56e5375e84689b891e0e6c5a02ec12a1f18d9", "tree": "a1e128a71ff24fc705428df86a858076cfe4bc13", "parents": [ "6c09931b3f987898f5c581d267ef269f5e2e9575", "27aa55c5e5123fa8b8ad0156559d34d7edff58ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:51:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:51:57 2012 -0700" }, "message": "Merge tag \u0027arm64-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64\n\nPull arm64 support from Catalin Marinas:\n \"Linux support for the 64-bit ARM architecture (AArch64)\n\n Features currently supported:\n - 39-bit address space for user and kernel (each)\n - 4KB and 64KB page configurations\n - Compat (32-bit) user applications (ARMv7, EABI only)\n - Flattened Device Tree (mandated for all AArch64 platforms)\n - ARM generic timers\"\n\n* tag \u0027arm64-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (35 commits)\n arm64: ptrace: remove obsolete ptrace request numbers from user headers\n arm64: Do not set the SMP/nAMP processor bit\n arm64: MAINTAINERS update\n arm64: Build infrastructure\n arm64: Miscellaneous header files\n arm64: Generic timers support\n arm64: Loadable modules\n arm64: Miscellaneous library functions\n arm64: Performance counters support\n arm64: Add support for /proc/sys/debug/exception-trace\n arm64: Debugging support\n arm64: Floating point and SIMD\n arm64: 32-bit (compat) applications support\n arm64: User access library functions\n arm64: Signal handling support\n arm64: VDSO support\n arm64: System calls handling\n arm64: ELF definitions\n arm64: SMP support\n arm64: DMA mapping API\n ...\n" }, { "commit": "6c09931b3f987898f5c581d267ef269f5e2e9575", "tree": "27cc7d7304e189505e53b25c6284b1aa9a4f31d3", "parents": [ "b3eda8d05c1afe722dc19be3fee7eeadc75e25e2", "c397031f58f9a0a5d808dc998105781b1945b6fe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:49:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:49:56 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\nPull s390 updates from Martin Schwidefsky:\n \"The main new feature is machine support for System zEC12 including\n transactional memory, runtime instrumentation, support for scm block\n devices via eadm subchannels, and support for CEX4 crypto cards.\n\n In addition there are some nice improvements: bpf jit compiler, arch\n backend for cmpxchg_double, relative exception table entries, dasd\n partition detection independent from the dasd driver ioctls, and cpu\n cache information in /proc/cpuinfo and /sys/device/cpu.\n\n And last but not least a series of cleanup patches from Heiko.\"\n\nFix up trivial add-add conflict in arch/s390/Kconfig due to commit\nb952741c8079 (\"cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING\")\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (76 commits)\n s390: update defconfig\n s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL\n s390/disassembler: fix decoding of risblg instruction\n s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction\n s390/traps: move call to print_modules() out of show_regs()\n s390/mm: mark free_initrd_mem() as __init\n s390/dasd: check count address during online setting\n drivers/s390/char/monreader.c: fix error return code\n s390/cmpxchg,percpu: implement cmpxchg_double()\n s390/percpu: implement this_cpu_add_return()\n s390/percpu: implement this_cpu_xchg()\n s390/kexec: remove CONFIG_KEXEC\n s390/irq: use designated initializers for irq class array\n s390: add uninitialized_var() to suppress false positive compiler warnings\n s390/crashdump: move fill_cpu_elf_notes() prototype to header file\n s390/process: add missing header include\n s390/ptrace: add missing ifdef\n s390/ipl,decrompressor: disable branch profiling\n s390/perf_events: compile only for CONFIG_64BIT\n s390/tape: remove even more tape block leftovers\n ...\n" }, { "commit": "ac07f5c3cb0cf19258c55cdf210aa4ac91ca7330", "tree": "6741e6ca18db5e83641064fd1bdc31a818a19a21", "parents": [ "3b29b03a462346473b7d0e6c6013fe093a4ac0d1", "b1a74bf8212367be2b1d6685c11a84e056eaaaf1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:10:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:10:52 2012 -0700" }, "message": "Merge branch \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86/fpu update from Ingo Molnar:\n \"The biggest change is the addition of the non-lazy (eager) FPU saving\n support model and enabling it on CPUs with optimized xsaveopt/xrstor\n FPU state saving instructions.\n\n There are also various Sparse fixes\"\n\nFix up trivial add-add conflict in arch/x86/kernel/traps.c\n\n* \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, kvm: fix kvm\u0027s usage of kernel_fpu_begin/end()\n x86, fpu: remove cpu_has_xmm check in the fx_finit()\n x86, fpu: make eagerfpu\u003d boot param tri-state\n x86, fpu: enable eagerfpu by default for xsaveopt\n x86, fpu: decouple non-lazy/eager fpu restore from xsave\n x86, fpu: use non-lazy fpu restore for processors supporting xsave\n lguest, x86: handle guest TS bit for lazy/non-lazy fpu host models\n x86, fpu: always use kernel_fpu_begin/end() for in-kernel FPU usage\n x86, kvm: use kernel_fpu_begin/end() in kvm_load/put_guest_fpu()\n x86, fpu: remove unnecessary user_fpu_end() in save_xstate_sig()\n x86, fpu: drop_fpu() before restoring new state from sigframe\n x86, fpu: Unify signal handling code paths for x86 and x86_64 kernels\n x86, fpu: Consolidate inline asm routines for saving/restoring fpu state\n x86, signal: Cleanup ifdefs and is_ia32, is_x32\n" }, { "commit": "3b29b03a462346473b7d0e6c6013fe093a4ac0d1", "tree": "25f6e316344369c9b66010a9d67612488e24aca3", "parents": [ "58ae9c0d54ae3916614fa1f3756dadb954f16e6c", "2223af389032425e3d1a70f9cb3a63feaa654ced" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:08:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 11:08:12 2012 -0700" }, "message": "Merge branch \u0027x86-efi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86/EFI changes from Ingo Molnar:\n \"EFI loader robustness enhancements plus smaller fixes\"\n\n* \u0027x86-efi-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n efi: Fix the ACPI BGRT driver for images located in EFI boot services memory\n efi: Add a function to look up existing IO memory mappings\n efi: Defer freeing boot services memory until after ACPI init\n x86, EFI: Calculate the EFI framebuffer size instead of trusting the firmware\n efifb: Skip DMI checks if the bootloader knows what it\u0027s doing\n efi: initialize efi.runtime_version to make query_variable_info/update_capsule workable\n efi: Build EFI stub with EFI-appropriate options\n X86: Improve GOP detection in the EFI boot stub\n" }, { "commit": "7e92daaefa68e5ef1e1732e45231e73adbb724e7", "tree": "8e7f8ac9d82654df4c65939c6682f95510e22977", "parents": [ "7a68294278ae714ce2632a54f0f46916dca64f56", "1d787d37c8ff6612b8151c6dff15bfa7347bcbdf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:28:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:28:49 2012 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf update from Ingo Molnar:\n \"Lots of changes in this cycle as well, with hundreds of commits from\n over 30 contributors. Most of the activity was on the tooling side.\n\n Higher level changes:\n\n - New \u0027perf kvm\u0027 analysis tool, from Xiao Guangrong.\n\n - New \u0027perf trace\u0027 system-wide tracing tool\n\n - uprobes fixes + cleanups from Oleg Nesterov.\n\n - Lots of patches to make perf build on Android out of box, from\n Irina Tirdea\n\n - Extend ftrace function tracing utility to be more dynamic for its\n users. It allows for data passing to the callback functions, as\n well as reading regs as if a breakpoint were to trigger at function\n entry.\n\n The main goal of this patch series was to allow kprobes to use\n ftrace as an optimized probe point when a probe is placed on an\n ftrace nop. With lots of help from Masami Hiramatsu, and going\n through lots of iterations, we finally came up with a good\n solution.\n\n - Add cpumask for uncore pmu, use it in \u0027stat\u0027, from Yan, Zheng.\n\n - Various tracing updates from Steve Rostedt\n\n - Clean up and improve \u0027perf sched\u0027 performance by elliminating lots\n of needless calls to libtraceevent.\n\n - Event group parsing support, from Jiri Olsa\n\n - UI/gtk refactorings and improvements from Namhyung Kim\n\n - Add support for non-tracepoint events in perf script python, from\n Feng Tang\n\n - Add --symbols to \u0027script\u0027, similar to the one in \u0027report\u0027, from\n Feng Tang.\n\n Infrastructure enhancements and fixes:\n\n - Convert the trace builtins to use the growing evsel/evlist\n tracepoint infrastructure, removing several open coded constructs\n like switch like series of strcmp to dispatch events, etc.\n Basically what had already been showcased in \u0027perf sched\u0027.\n\n - Add evsel constructor for tracepoints, that uses libtraceevent just\n to parse the /format events file, use it in a new \u0027perf test\u0027 to\n make sure the libtraceevent format parsing regressions can be more\n readily caught.\n\n - Some strange errors were happening in some builds, but not on the\n next, reported by several people, problem was some parser related\n files, generated during the build, didn\u0027t had proper make deps, fix\n from Eric Sandeen.\n\n - Introduce struct and cache information about the environment where\n a perf.data file was captured, from Namhyung Kim.\n\n - Fix handling of unresolved samples when --symbols is used in\n \u0027report\u0027, from Feng Tang.\n\n - Add union member access support to \u0027probe\u0027, from Hyeoncheol Lee.\n\n - Fixups to die() removal, from Namhyung Kim.\n\n - Render fixes for the TUI, from Namhyung Kim.\n\n - Don\u0027t enable annotation in non symbolic view, from Namhyung Kim.\n\n - Fix pipe mode in \u0027report\u0027, from Namhyung Kim.\n\n - Move related stats code from stat to util/, will be used by the\n \u0027stat\u0027 kvm tool, from Xiao Guangrong.\n\n - Remove die()/exit() calls from several tools.\n\n - Resolve vdso callchains, from Jiri Olsa\n\n - Don\u0027t pass const char pointers to basename, so that we can\n unconditionally use libgen.h and thus avoid ifdef BIONIC lines,\n from David Ahern\n\n - Refactor hist formatting so that it can be reused with the GTK\n browser, From Namhyung Kim\n\n - Fix build for another rbtree.c change, from Adrian Hunter.\n\n - Make \u0027perf diff\u0027 command work with evsel hists, from Jiri Olsa.\n\n - Use the only field_sep var that is set up: symbol_conf.field_sep,\n fix from Jiri Olsa.\n\n - .gitignore compiled python binaries, from Namhyung Kim.\n\n - Get rid of die() in more libtraceevent places, from Namhyung Kim.\n\n - Rename libtraceevent \u0027private\u0027 struct member to \u0027priv\u0027 so that it\n works in C++, from Steven Rostedt\n\n - Remove lots of exit()/die() calls from tools so that the main perf\n exit routine can take place, from David Ahern\n\n - Fix x86 build on x86-64, from David Ahern.\n\n - {int,str,rb}list fixes from Suzuki K Poulose\n\n - perf.data header fixes from Namhyung Kim\n\n - Allow user to indicate objdump path, needed in cross environments,\n from Maciek Borzecki\n\n - Fix hardware cache event name generation, fix from Jiri Olsa\n\n - Add round trip test for sw, hw and cache event names, catching the\n problem Jiri fixed, after Jiri\u0027s patch, the test passes\n successfully.\n\n - Clean target should do clean for lib/traceevent too, fix from David\n Ahern\n\n - Check the right variable for allocation failure, fix from Namhyung\n Kim\n\n - Set up evsel-\u003etp_format regardless of evsel-\u003ename being set\n already, fix from Namhyung Kim\n\n - Oprofile fixes from Robert Richter.\n\n - Remove perf_event_attr needless version inflation, from Jiri Olsa\n\n - Introduce libtraceevent strerror like error reporting facility,\n from Namhyung Kim\n\n - Add pmu mappings to perf.data header and use event names from cmd\n line, from Robert Richter\n\n - Fix include order for bison/flex-generated C files, from Ben\n Hutchings\n\n - Build fixes and documentation corrections from David Ahern\n\n - Assorted cleanups from Robert Richter\n\n - Let O\u003d makes handle relative paths, from Steven Rostedt\n\n - perf script python fixes, from Feng Tang.\n\n - Initial bash completion support, from Frederic Weisbecker\n\n - Allow building without libelf, from Namhyung Kim.\n\n - Support DWARF CFI based unwind to have callchains when %bp based\n unwinding is not possible, from Jiri Olsa.\n\n - Symbol resolution fixes, while fixing support PPC64 files with an\n .opt ELF section was the end goal, several fixes for code that\n handles all architectures and cleanups are included, from Cody\n Schafer.\n\n - Assorted fixes for Documentation and build in 32 bit, from Robert\n Richter\n\n - Cache the libtraceevent event_format associated to each evsel\n early, so that we avoid relookups, i.e. calling pevent_find_event\n repeatedly when processing tracepoint events.\n\n [ This is to reduce the surface contact with libtraceevents and\n make clear what is that the perf tools needs from that lib: so\n far parsing the common and per event fields. ]\n\n - Don\u0027t stop the build if the audit libraries are not installed, fix\n from Namhyung Kim.\n\n - Fix bfd.h/libbfd detection with recent binutils, from Markus\n Trippelsdorf.\n\n - Improve warning message when libunwind devel packages not present,\n from Jiri Olsa\"\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (282 commits)\n perf trace: Add aliases for some syscalls\n perf probe: Print an enum type variable in \"enum variable-name\" format when showing accessible variables\n perf tools: Check libaudit availability for perf-trace builtin\n perf hists: Add missing period_* fields when collapsing a hist entry\n perf trace: New tool\n perf evsel: Export the event_format constructor\n perf evsel: Introduce rawptr() method\n perf tools: Use perf_evsel__newtp in the event parser\n perf evsel: The tracepoint constructor should store sys:name\n perf evlist: Introduce set_filter() method\n perf evlist: Renane set_filters method to apply_filters\n perf test: Add test to check we correctly parse and match syscall open parms\n perf evsel: Handle endianity in intval method\n perf evsel: Know if byte swap is needed\n perf tools: Allow handling a NULL cpu_map as meaning \"all cpus\"\n perf evsel: Improve tracepoint constructor setup\n tools lib traceevent: Fix error path on pevent_parse_event\n perf test: Fix build failure\n trace: Move trace event enable from fs_initcall to core_initcall\n tracing: Add an option for disabling markers\n ...\n" }, { "commit": "620e77533f29796df7aff861e79bd72e08554ebb", "tree": "844afce2333549bc5b8d7dc87a4875b9216a0023", "parents": [ "6977b4c7736e8809b7959c66875a16c0bbcf2152", "fa34da708cbe1e2d9a2ee7fc68ea8fccbf095d12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:16:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:16:42 2012 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull RCU changes from Ingo Molnar:\n\n 0. \u0027idle RCU\u0027:\n\n Adds RCU APIs that allow non-idle tasks to enter RCU idle mode and\n provides x86 code to make use of them, allowing RCU to treat\n user-mode execution as an extended quiescent state when the new\n RCU_USER_QS kernel configuration parameter is specified. (Work is\n in progress to port this to a few other architectures, but is not\n part of this series.)\n\n 1. A fix for a latent bug that has been in RCU ever since the addition\n of CPU stall warnings. This bug results in false-positive stall\n warnings, but thus far only on embedded systems with severely\n cut-down userspace configurations.\n\n 2. Further reductions in latency spikes for huge systems, along with\n additional boot-time adaptation to the actual hardware.\n\n This is a large change, as it moves RCU grace-period initialization\n and cleanup, along with quiescent-state forcing, from softirq to a\n kthread. However, it appears to be in quite good shape (famous\n last words).\n\n 3. Updates to documentation and rcutorture, the latter category\n including keeping statistics on CPU-hotplug latencies and fixing\n some initialization-time races.\n\n 4. CPU-hotplug fixes and improvements.\n\n 5. Idle-loop fixes that were omitted on an earlier submission.\n\n 6. Miscellaneous fixes and improvements\n\nIn certain RCU configurations new kernel threads will show up (rcu_bh,\nrcu_sched), showing RCU processing overhead.\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (90 commits)\n rcu: Apply micro-optimization and int/bool fixes to RCU\u0027s idle handling\n rcu: Userspace RCU extended QS selftest\n x86: Exit RCU extended QS on notify resume\n x86: Use the new schedule_user API on userspace preemption\n rcu: Exit RCU extended QS on user preemption\n rcu: Exit RCU extended QS on kernel preemption after irq/exception\n x86: Exception hooks for userspace RCU extended QS\n x86: Unspaghettize do_general_protection()\n x86: Syscall hooks for userspace RCU extended QS\n rcu: Switch task\u0027s syscall hooks on context switch\n rcu: Ignore userspace extended quiescent state by default\n rcu: Allow rcu_user_enter()/exit() to nest\n rcu: Settle config for userspace extended quiescent state\n rcu: Make RCU_FAST_NO_HZ handle adaptive ticks\n rcu: New rcu_user_enter_after_irq() and rcu_user_exit_after_irq() APIs\n rcu: New rcu_user_enter() and rcu_user_exit() APIs\n ia64: Add missing RCU idle APIs on idle loop\n xtensa: Add missing RCU idle APIs on idle loop\n score: Add missing RCU idle APIs on idle loop\n parisc: Add missing RCU idle APIs on idle loop\n ...\n" }, { "commit": "c00aaa1a0221a22153071fcb2f320e2ebaecc2fd", "tree": "d4d4d23b4dd1529c9315a8914a588c4669ea7c41", "parents": [ "e20d583818a5d6fc052e59fe2345d82ffd089462" ], "author": { "name": "Mike Marciniszyn", "email": "mike.marciniszyn@intel.com", "time": "Fri Sep 28 17:33:52 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon Oct 01 09:59:26 2012 -0700" }, "message": "IB/qib: Fix local access validation for user MRs\n\nCommit 8aac4cc3a9d7 (\"IB/qib: RCU locking for MR validation\") introduced\na bug that broke user post sends. The proper validation of the MR\nwas lost in the patch.\n\nThis patch corrects that validation.\n\nReviewed-by: Dean Luick \u003cdean.luick@intel.com\u003e\nSigned-off-by: Mike Marciniszyn \u003cmike.marciniszyn@intel.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "9fa40a1135d94cb6eed99e264c6d4fe00c0a73f9", "tree": "94f331c35b60e160103c2467ab5d64ff1eb3c9e3", "parents": [ "99dbb1632f1165c2726056ebfce6edde0e5a0208", "cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 09:13:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 09:13:10 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID updates from Jiri Kosina:\n\n 1) Patchset from Henrik Rydberg which substantially reduces irqsoff\n latency for all input devices. In addition to that, Henrik reworked\n multitouch handling in order to reduce runtime memory consumption.\n\n This patchset touches code in Input subsystem as well. All the\n changes have been Acked by Dmitry, and we agreed to do it this way\n due to inter-dependencies between the patchset and subsequent\n changes in HID subsystem.\n\n 2) Rework, clenaups and a lot of fixes to picolcd driver by Bruno\n Prémont.\n\n 3) Core report descriptor handling fix which fixes resume issue on some\n devices, by Kevin Daughtridge\n\n 4) hidraw fixes by Alexey Khoroshilov and Ratan Nalumasu\n\n 5) wiimote driver now supports balance board, by David Herrmann.\n\n 6) Other smaller fixes and new device id additions all over the place.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (79 commits)\n HID: hidraw: don\u0027t deallocate memory when it is in use\n HID: picoLCD: optimize for inactive debugfs\n HID: multitouch: add support for GeneralTouch multi-touchscreen\n HID: Add support for Sony PS3 BD Remote Control\n HID: keep dev_rdesc unmodified and use it for comparisons\n HID: lg4ff: Minor coding style fixes in lg4ff and hid-lg\n HID: hid-lg4ff: Set absolute axes parametes on DFP\n HID: hid-lg4ff: Adjust X axis input value accordingly to selected range.\n HID: hid-lg4ff: Minor code cleanup to improve readability\n HID: ntrig: change default value of logical/physical width/height to 1\n HID: picoLCD: bounds check in dump_buff_as_hex()\n Input: bcm5974 - Convert to MT-B\n Input: bcm5974 - Drop the logical dimensions\n Input: bcm5974 - Preparatory renames\n Input: bcm5974 - only setup button urb for TYPE1 devices\n HID: hid-multitouch: Add Flatfrog support\n HID: hid-multitouch: Fix contact count on 3M panels\n HID: hid-multitouch: Remove the redundant touch state\n HID: hid-multitouch: Simplify setup and frame synchronization\n HID: Allow more fields in the hid report\n ...\n" }, { "commit": "99dbb1632f1165c2726056ebfce6edde0e5a0208", "tree": "2b2fc83db20b4c6d13842496899774b0dc2868e2", "parents": [ "aae6f989c6e97ff8197717fa4d032ad4eba091a7", "9c33c512b2d3167a3580659942ee78437b1b1bc6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 09:06:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 09:06:36 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull the trivial tree from Jiri Kosina:\n \"Tiny usual fixes all over the place\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)\n doc: fix old config name of kprobetrace\n fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc\n btrfs: fix the commment for the action flags in delayed-ref.h\n btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID\n vfs: fix kerneldoc for generic_fh_to_parent()\n treewide: fix comment/printk/variable typos\n ipr: fix small coding style issues\n doc: fix broken utf8 encoding\n nfs: comment fix\n platform/x86: fix asus_laptop.wled_type module parameter\n mfd: printk/comment fixes\n doc: getdelays.c: remember to close() socket on error in create_nl_socket()\n doc: aliasing-test: close fd on write error\n mmc: fix comment typos\n dma: fix comments\n spi: fix comment/printk typos in spi\n Coccinelle: fix typo in memdup_user.cocci\n tmiofb: missing NULL pointer checks\n tools: perf: Fix typo in tools/perf\n tools/testing: fix comment / output typos\n ...\n" }, { "commit": "aae6f989c6e97ff8197717fa4d032ad4eba091a7", "tree": "3908e2748a91045688a4778872785b8b0660d073", "parents": [ "b34e5f55a1e6667a800280fc4045632c139b4e4e", "6a2027abd2048f7f7fdcc6e11ff10b3d9b0d0899" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 08:58:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 08:58:47 2012 -0700" }, "message": "Merge tag \u0027regulator-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator updates from Mark Brown:\n - Support for putting regulators into bypass mode where they simply\n switch their input to the output (mainly used for low power\n retention).\n - A new API for setting voltages based on a voltage plus tolerance\n rather than an explicit voltage range.\n - Lots of cleanups and API updates from Axel Lin.\n - New driver for MAX8907.\n\n* tag \u0027regulator-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (71 commits)\n regulator: arizona-ldo: Remove top voltage\n regulator: tps6586x: remove regulator-compatible from DT docs\n regulator: tps65217.txt: remove regulator-compatible from DT docs\n regulator: deprecate regulator-compatible DT property\n regulator: fan53555: remove vsel_max not used\n regulator: aat2870: Don\u0027t explicitly initialise the first field\n extcon: arizona: Use bypass mode for MICVDD\n regulator: wm831x-ldo: Add bypass support\n regulator: arizona-micsupp: Support get/set bypass\n regulator: arizona-ldo: Support get/set bypass\n regulator: core: Provide regmap get/set bypass operations\n regulator: core: Support bypass mode\n regulator: Fairchild fan53555 support\n regulator: twl: Remove another unused variable warning\n regulator: core: Try using the parent device for the default regmap\n regulator: core: Fast path non-deferred disables\n regulator: core: Report microvolts in sysfs even with only list_voltage()\n regulator: tps6586x: add support for SYS rail\n regulator: lp872x: remove unnecessary function\n regulator: lp872x: fix NULL pointer access problem\n ...\n" }, { "commit": "b34e5f55a1e6667a800280fc4045632c139b4e4e", "tree": "c7664dd3fe3a37f89394ae926c83fb859263b765", "parents": [ "e151960a23cc99e310f90adad7ee592821a77434", "613dac31a612f9417bd1b1438acebbc3b8f9073e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 08:58:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 08:58:06 2012 -0700" }, "message": "Merge tag \u0027regmap-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull regmap updates from Mark Brown:\n \"A quiet release for the regmap core, essentially all the activity is\n in the shared interrupt controller which is being more and more widely\n used and has been enhanced to support a wider range of masking types\n and wake handling methods, plus integration with runtime PM for\n devices making aggressive use of that.\"\n\n* tag \u0027regmap-3.7\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:\n regmap: no need primary handler for nested irq\n regmap: irq: Add mask invert flag for enable register\n mfd: wm8994: Flag the interrupt block as requiring runtime PM be enabled\n regmap: irq: Enable devices for runtime PM while handling interrupts\n regmap: irq: initialize all irqs to wake disabled\n regmap: set MASK_ON_SUSPEND/SKIP_SET_WAKE if no wake_base\n regmap: name irq_chip based on regmap_irq_chip\u0027s name\n regmap: store irq_chip inside regmap_irq_chip_data\n regmap: irq: Only update mask bits when doing initial mask\n regmap: fix some error messages to take account of irq_reg_stride\n regmap: Don\u0027t lock in regmap_reinit_cache()\n" }, { "commit": "cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa", "tree": "46673a3c432958a4f712b064ddb9b645771cc0c3", "parents": [ "a3cbe10e474ac8c2c30a151a7812e15e4cfa2775", "f5ff4e1e62408327d27fb1e1ab00e96a52b7cd46" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 14:38:54 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 14:38:54 2012 +0200" }, "message": "Merge branch \u0027multitouch\u0027 into for-linus\n\nConflicts:\n\tdrivers/hid/hid-multitouch.c\n" }, { "commit": "a3cbe10e474ac8c2c30a151a7812e15e4cfa2775", "tree": "f245dd77a3dede97a80f8369d984334b56220752", "parents": [ "fa2bd30159499f441125495ba8d9d57f646ea42a", "86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 14:37:51 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 14:37:51 2012 +0200" }, "message": "Merge branch \u0027upstream\u0027 into for-linus\n\nConflicts:\n\tdrivers/hid/usbhid/hid-quirks.c\n" }, { "commit": "fa2bd30159499f441125495ba8d9d57f646ea42a", "tree": "f5afca7fb3bcccc81f74889adc44c08563dceb40", "parents": [ "1ad346a9f8ca0d266ddbfdbbbd8913782b417f35", "4fe9f8e203fdad1524c04beb390f3c6099781ed9", "a80fe5d6e3190f65be8cc7efa487f187eb3dbffa", "56fa94415b8a1a163e24a105fb5bdadc625c1d2a", "5844c1cdb630b537a2ecdf74dab2985e51dc1bd9", "eb4e426a480ce99004134ee22e6a3b7ab88f979c", "8908dd806340513dacfd37b21e047946bca995d1", "a2f6e4e009f13097acafd09cccf274fb5869dde2" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 14:36:26 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 14:36:26 2012 +0200" }, "message": "Merge branches \u0027from-henrik\u0027, \u0027hidraw\u0027, \u0027logitech\u0027, \u0027picolcd\u0027, \u0027ps3\u0027, \u0027uclogic\u0027, \u0027wacom\u0027 and \u0027wiimote\u0027 into for-linus\n" }, { "commit": "536a53a300d0d40152796eefb0a9e6e36ca37f7d", "tree": "e644203945ee780d8a1a4cdc656d9b4984f5361d", "parents": [ "f4b81dd83e38277a3d1e6661f0fa8eea8cfe784b" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Fri Sep 28 10:15:48 2012 -0600" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Oct 01 13:29:49 2012 +0100" }, "message": "spi: remove completely broken Tegra driver\n\nThe current SPI driver has many issues. Examples are:\n\n* Segfaulting on most transfers due to expecting all transfers to have\n both RX and TX buffers.\n* Hanging on TX transfers since the whole driver flow is driven by RX\n DMA completion, but the HW is only told to enable RX for RX transfers.\n* Use of clk_disable_unprepare() from atomic context.\n* Once those and other minor issues are fixed, the driver still doesn\u0027t\n actually work.\n* The driver also implements a deprecated API to the SPI core.\n\nFor this reason, simply remove the driver completely. This has two\nadvantages:\n\n1) This will remove the last use of Tegra\u0027s \u003cmach/dma.h\u003e, which will\n allow that file to be removed, which is required for single zImage\n work.\n\n2) The downstream driver is significaly different from the current\n code. I believe a patch to re-add the downstream driver (with\n appropriate cleanup) will be much simpler to review if it\u0027s a new\n file rather than randomly interspered with essentially unrelated\n existing code.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "e4d680c706284ca0413a84bd2a28fda76b360904", "tree": "6613396dafb5c7d1f2d946ea8e7f4f57a482bad6", "parents": [ "a248afdc1b5916c2bfd007233112333d85aa28f6", "5160b46f3e53c41c4c6b9e7cdbe0401d3afbfb63" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 01 07:39:36 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Oct 01 07:39:36 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "aadf4f3f66a7b710b05b31ac0839fbbf59e41f7c", "tree": "d33fab82c180e7919ede40f02c1eea363a4e40c6", "parents": [ "ca3e57a599e1f3624a6164a5c3a655859368f7aa" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Sep 27 10:01:19 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon Oct 01 02:10:45 2012 -0700" }, "message": "mlx4_core: Disable SENSE_PORT for multifunction devices\n\nIn the current driver, the SENSE_PORT firmware command is issued as a\n\"wrapped\" command, but the command handling code doesn\u0027t have a\nwrapper, so it will never do anything other than log an error message.\nThe latest ConnectX-3 2.11.500 firmware reports the SENSE_PORT\ncapability even in multi-function (SR-IOV) mode, so the driver will\ntry to issue the command.\n\nAt least until the driver has a proper wrapper for SENSE_PORT, make\nsure we disable the command for multi-function devices.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "ca3e57a599e1f3624a6164a5c3a655859368f7aa", "tree": "b5515a00d42519620872d3a67ffa337fcfa7a4a8", "parents": [ "839f12434c7618d326b9d1ece5eca643e5e48d0a" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Sep 27 09:53:05 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon Oct 01 02:10:44 2012 -0700" }, "message": "mlx4_core: Clean up enabling of SENSE_PORT for older (ConnectX-1/-2) HCAs\n\nInstead of having a hard-coded \"PCI device ID !\u003d 0x1003\" (which\nobviously breaks as newer devices with ID !\u003d 0x1003 become available),\ninstead let\u0027s set a flag in our PCI device table for the older devices\nwhere we\u0027re supposed to force using SENSE_PORT. This also avoids\nenabling SENSE_PORT for virtual functions by mistake.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "839f12434c7618d326b9d1ece5eca643e5e48d0a", "tree": "5156372842e84963423bb7a7622e485fec9e2c7f", "parents": [ "f3d4c89ee4a8c993cc334a67f84a3fb724a1dd35" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Sep 27 09:23:41 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon Oct 01 02:10:39 2012 -0700" }, "message": "mlx4_core: Stash PCI ID driver_data in mlx4_priv structure\n\nThat way we can check flags later on, when we\u0027ve finished with the\npci_device_id structure. Also convert the \"is VF\" flag to an enum:\n\"Never do in the preprocessor what can be done in C.\"\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "4fe9f8e203fdad1524c04beb390f3c6099781ed9", "tree": "b3f6e92fb068c718fd2f6a9b345b03f3dda970ed", "parents": [ "cead24c1181ad199354bd08013d0f9d08b66691b" ], "author": { "name": "Ratan Nalumasu", "email": "ratan@google.com", "time": "Sat Sep 22 11:46:30 2012 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 10:27:36 2012 +0200" }, "message": "HID: hidraw: don\u0027t deallocate memory when it is in use\n\nWhen a device is unplugged, wait for all processes that have opened the device\nto close before deallocating the device.\n\nSigned-off-by: Ratan Nalumasu \u003cratan@google.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "56fa94415b8a1a163e24a105fb5bdadc625c1d2a", "tree": "b1a91eb5032c56267427de1ea6c8859903e2a46c", "parents": [ "5ed84c341c25accc61410cfb53a45170f8fb19e4" ], "author": { "name": "Bruno Prémont", "email": "bonbons@linux-vserver.org", "time": "Sun Sep 30 22:04:19 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 10:25:01 2012 +0200" }, "message": "HID: picoLCD: optimize for inactive debugfs\n\nMatthieu CASTET adjusted picolcd_debug_out_report() to only operate when\nthere is an active listener on debugfs for events.\n\nHis change got lost while splitting hid_picolcd.c, restore it.\n\nSigned-off-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "f5ff4e1e62408327d27fb1e1ab00e96a52b7cd46", "tree": "2af7fbdef117f60e768b0016fbdb4db5b07008a1", "parents": [ "dfeefd108ab2ae2975abb126be7cef449a691e9e" ], "author": { "name": "Xianhan Yu", "email": "aroundight77@gmail.com", "time": "Fri Sep 28 10:18:59 2012 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 10:15:02 2012 +0200" }, "message": "HID: multitouch: add support for GeneralTouch multi-touchscreen\n\nFix the touch-up no response problem on GeneralTouch twofingers touchscreen and\nmodify the driver for new GeneralTouch PWT touchscreen.\n\nSigned-off-by: Xianhan Yu \u003caroundight77@gmail.com\u003e\nReviewed-by Benjamin Tissoires \u003cbenjamin.tissoires@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "5844c1cdb630b537a2ecdf74dab2985e51dc1bd9", "tree": "7374a3cc5379f68a4c0c95a430bb300f2f7cda44", "parents": [ "cead24c1181ad199354bd08013d0f9d08b66691b" ], "author": { "name": "David Dillow", "email": "dave@thedillows.org", "time": "Tue Sep 25 23:02:27 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 10:11:48 2012 +0200" }, "message": "HID: Add support for Sony PS3 BD Remote Control\n\nThe Sony PS3 Blue-ray Disc Remote Control used to be supported by the\nBlueZ project\u0027s user space, but the code that handled it was recently\nremoved as its functionality conflicted with a real HSP implementation\nand the mapping was thought to be better handled in the kernel. This is\na port of the mapping logic from the fakehid driver by Marcel Holtmann\nto the in-kernel HID layer.\n\nWe also add support for the Logitech Harmony Adapter for PS3, which\nemulates the BD Remote.\n\nSigned-off-by: David Dillow \u003cdave@thedillows.org\u003e\nSigned-off-by: Antonio Ospite \u003cospite@studenti.unina.it\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6", "tree": "d00ef9d1f11bae93c5e809246f8eae156d74b1ed", "parents": [ "4cc9834518efed3b69d3a8ff3bd162e089f68d34" ], "author": { "name": "Kevin Daughtridge", "email": "kevin@kdau.com", "time": "Thu Sep 20 12:00:32 2012 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 01 10:09:26 2012 +0200" }, "message": "HID: keep dev_rdesc unmodified and use it for comparisons\n\nThe dev_rdesc member of the hid_device structure is meant to store the original\nreport descriptor received from the device, but it is currently passed to any\nreport_fixup method before it is copied to the rdesc member. This patch uses a\ntemporary buffer to shield dev_rdesc from the side effects of many HID drivers\u0027\nreport_fixup implementations.\n\nusbhid\u0027s hid_post_reset checks the report descriptor currently returned by the\ndevice against a descriptor that may have been modified by a driver\u0027s\nreport_fixup method. That leaves some devices nonfunctional after a resume, with\na \"reset_resume error 1\" reported. This patch checks the new descriptor against\nthe unmodified dev_rdesc instead and uses the original, instead of modified,\nreport size.\n\nBugLink: http://bugs.launchpad.net/bugs/1049623\nSigned-off-by: Kevin Daughtridge \u003ckevin@kdau.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e1b2dc70cd5b00e17c703163a463d82354b1cc76", "tree": "fc013a598baa611ba6651b760f8a03347b2d6e47", "parents": [ "b0e181d0944e858ae0cacf808752e791894c5651" ], "author": { "name": "Simon Arlott", "email": "simon@fire.lp0.eu", "time": "Thu Sep 27 22:10:11 2012 -0600" }, "committer": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Oct 01 08:05:22 2012 +0200" }, "message": "pinctrl: add bcm2835 driver\n\nThe BCM2835 GPIO module is a combined GPIO controller, (GPIO) interrupt\ncontroller, and pinmux/control device.\n\nOriginal driver by Simon Arlott.\nRewrite including GPIO chip device by Chris Boot.\n\nUpstreaming changes by Stephen Warren:\n* Wrote DT binding documentation.\n* Changed brcm,function to an integer to more directly match the\n datasheet, and to match brcm,pins being an integer.\n* Implemented pull-up/down pin config.\n* Removed read-only DT property and related code. The restriction this\n implemented are driven by the board, not the GPIO HW block, so don\u0027t\n really make sense of a HW block binding, were in general incomplete\n (since they could only know about the few pins hard-coded into the\n Raspberry Pi B board design and not the uncommitted GPIOS), and are\n better represented simply by not writing incorrect data into pin\n configuration nodes.\n* Don\u0027t set GPIO_IN function select in gpio_request_enable() to avoid\n glitches; defer this to gpio_set_direction(). Consequently, removed\n empty bcm2835_pmx_gpio_request_enable().\n* Simplified enabled_irq_map[]; make it explicitly 1 entry per bank.\n* Lifted use of enabled_irq_map[] outside the per-interrupt loop in\n IRQ handler, thus fixing an issue where the code was indexing into\n enabled_irq_map[] by intra-bank GPIO ID, not global GPIO ID.\n* Removed locking in IRQ handler, since all other code uses\n spin_lock_irqsave() and so guarantees it doesn\u0027t run concurrently\n with the handler.\n* Moved duplicated BUILD_BUG_ON()s into probe(). Also check size of\n bcm2835_gpio_pins[].\n* Remove range-checking from bcm2835_pctl_get_groups_count() since we\u0027ve\n decided to trust the pinctrl core.\n* Made bcm2835_pmx_gpio_disable_free() call bcm2835_pinctrl_fsel_set()\n directly for simplicity.\n* Fixed body of dt_free_map() to match latest dt_node_to_map().\n* Removed GPIO ownership check from bcm2835_pmx_enable() since the pinctrl\n core owns doing this.\n* Made irq_chip and pinctrl_gpio_range .name \u003d\u003d MODULE_NAME so it\u0027s more\n descriptive.\n* Simplified remove(); removed call to non-existent\n pinctrl_remove_gpio_range(), remove early return on error.\n* Don\u0027t force gpiochip\u0027s base to 0. Set gpio_range.base to gpiochip\u0027s\n base GPIO number.\n* Error-handling cleanups in probe().\n* Switched to module_platform_driver() rather than open-coding.\n* Made pin, group, and function names lower-case.\n* s/broadcom/brcm/ in DT property names.\n* s/2708/2835/.\n* Fixed a couple minor checkpatch warnings, and other minor cleanup.\n\nSigned-off-by: Simon Arlott \u003csimon@fire.lp0.eu\u003e\nSigned-off-by: Chris Boot \u003cbootc@bootc.net\u003e\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\n" }, { "commit": "d8536670916a685df116b5c2cb256573fd25e4e3", "tree": "5b5bf699030e19d41108f08a2fe79263a32a1904", "parents": [ "9b796d06d5d1b1e85ae2316a283ea11dd739ef96" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Aug 24 10:29:11 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:36:48 2012 -0700" }, "message": "IB/srp: Avoid having aborted requests hang\n\nWe need to call scsi_done() for commands after we abort them.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nAcked-by: David Dillow \u003cdillowda@ornl.gov\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "9b796d06d5d1b1e85ae2316a283ea11dd739ef96", "tree": "bc3a48847b26bc54d3d87f0ae6d264a0ed4ff681", "parents": [ "979570e02981d4a8fc20b3cc8fd651856c98ee9d" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Aug 24 10:27:54 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:36:47 2012 -0700" }, "message": "IB/srp: Fix use-after-free in srp_reset_req()\n\nsrp_free_req() uses the scsi_cmnd structure contents to unmap\nbuffers, so we must invoke srp_free_req() before we release\nownership of that structure.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nAcked-by: David Dillow \u003cdillowda@ornl.gov\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "e20d583818a5d6fc052e59fe2345d82ffd089462", "tree": "2fa6ff6380d584179be396437664a670922b9547", "parents": [ "979570e02981d4a8fc20b3cc8fd651856c98ee9d" ], "author": { "name": "Dean Luick", "email": "dean.luick@intel.com", "time": "Thu Sep 13 17:19:02 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:36:29 2012 -0700" }, "message": "IB/qib: Add a qib driver version\n\nReviewed-by: Mike Marciniszyn \u003cmike.marciniszyn@intel.com\u003e\nSigned-off-by: Dean Luick \u003cdean.luick@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "bca1935ccdecf2354a55d9edab4c022a995ee490", "tree": "6b39eadf3fda07247644ba590ed664b577e75781", "parents": [ "818216442b6dd49fa93a4caf9d7b56af364b502b" ], "author": { "name": "Tatyana Nikolova", "email": "Tatyana.E.Nikolova@intel.com", "time": "Thu Sep 20 22:37:09 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:34:55 2012 -0700" }, "message": "RDMA/nes: Fix compilation error when nes_debug is enabled\n\nRemoving old variables caused a compile error from nes_debug().\n\nSigned-off-by: Tatyana Nikolova \u003cTatyana.E.Nikolova@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "818216442b6dd49fa93a4caf9d7b56af364b502b", "tree": "f9f576907c2b3ae24a9a681fcb161b82802fea86", "parents": [ "fc4ba7291b3dc7ace34794f51c47f041949c7a92" ], "author": { "name": "Tatyana Nikolova", "email": "Tatyana.E.Nikolova@intel.com", "time": "Thu Sep 20 21:08:04 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:34:55 2012 -0700" }, "message": "RDMA/nes: Print hardware resource type\n\nHardware resource types are added and when a resource isn\u0027t available,\nits type is printed.\n\nSigned-off-by: Tatyana Nikolova \u003cTatyana.E.Nikolova@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "fc4ba7291b3dc7ace34794f51c47f041949c7a92", "tree": "72693baeb618f818c39b815e287639f751934d1c", "parents": [ "48a9956362c27e717a76435d450d906d5f49344a" ], "author": { "name": "Tatyana Nikolova", "email": "Tatyana.E.Nikolova@intel.com", "time": "Thu Sep 20 20:55:33 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:34:54 2012 -0700" }, "message": "RDMA/nes: Fix for crash when TX checksum offload is off\n\nWhen TX checksum offload is disabled for an iWarp connection,\nskb-\u003eip_summed needs to be set to CHECKSUM_NONE.\n\nSigned-off-by: Tatyana Nikolova \u003cTatyana.E.Nikolova@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "48a9956362c27e717a76435d450d906d5f49344a", "tree": "c410ccf83cb0429834505f79216af7dbff9b18f8", "parents": [ "6ad1be814b106e182d9b12898280d0c115541b72" ], "author": { "name": "Tatyana Nikolova", "email": "Tatyana.E.Nikolova@intel.com", "time": "Thu Sep 20 20:53:27 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:34:53 2012 -0700" }, "message": "RDMA/nes: Cosmetic changes\n\n - Remove unnecessary statement \"if (1)\"\n - Refactor a statement (wqe_misc |\u003d NES_NIC_SQ_WQE_COMPLETION) out of\n if/else statement, because it is independant of the flow.\n - Define netdev-\u003efeatures in one line for clarity.\n\nSigned-off-by: Tatyana Nikolova \u003cTatyana.E.Nikolova@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "6ad1be814b106e182d9b12898280d0c115541b72", "tree": "171a7f491da1cba4ea60c1d9a865324d25dc240b", "parents": [ "ef3d0c4a5e8c7ad3429b9f9ef66cf5a7563cd513" ], "author": { "name": "Tatyana Nikolova", "email": "Tatyana.E.Nikolova@intel.com", "time": "Thu Sep 20 19:34:20 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:34:52 2012 -0700" }, "message": "RDMA/nes: Fix for incorrect MSS when TSO is on\n\nIn TSO handling code, skb_shared_info() is used to get the MSS\ninstead of the bool function skb_is_gso() (which always returns 1).\n\nSigned-off-by: Tatyana Nikolova \u003cTatyana.E.Nikolova@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "ef3d0c4a5e8c7ad3429b9f9ef66cf5a7563cd513", "tree": "9914b85c88bb87b5af367c2a5c5b1449fbb50dd0", "parents": [ "979570e02981d4a8fc20b3cc8fd651856c98ee9d" ], "author": { "name": "Tatyana Nikolova", "email": "Tatyana.E.Nikolova@intel.com", "time": "Thu Sep 20 19:23:14 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:34:52 2012 -0700" }, "message": "RDMA/nes: Fix incorrect resolving of the loopback MAC address\n\nSigned-off-by: Tatyana Nikolova \u003cTatyana.E.Nikolova@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "f3d4c89ee4a8c993cc334a67f84a3fb724a1dd35", "tree": "5b003102f64cf1df23a43f738627e2f7cf1e21cc", "parents": [ "84b1f1538fadd066cc9877c2276f3fefd8a79bc4" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Sep 25 21:24:07 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:33:46 2012 -0700" }, "message": "mlx4_core: Fix crash on uninitialized priv-\u003ecmd.slave_sem\n\nOn an SR-IOV master device, __mlx4_init_one() calls mlx4_init_hca()\nbefore mlx4_multi_func_init(). However, for unlucky configurations,\nmlx4_init_hca() might call mlx4_SENSE_PORT() (via mlx4_dev_cap()), and\nthat calls mlx4_cmd_imm() with MLX4_CMD_WRAPPED set.\n\nHowever, on a multifunction device with MLX4_CMD_WRAPPED, __mlx4_cmd()\ncalls into mlx4_slave_cmd(), and that immediately tries to do\n\n\tdown(\u0026priv-\u003ecmd.slave_sem);\n\nbut priv-\u003ecmd.slave_sem isn\u0027t initialized until mlx4_multi_func_init()\n(which we haven\u0027t called yet). The next thing it tries to do is access\npriv-\u003emfunc.vhcr, but that hasn\u0027t been allocated yet.\n\nFix this by moving the initialization of slave_sem and vhcr up into\nmlx4_cmd_init(). Also, since slave_sem is really just being used as a\nmutex, convert it into a slave_cmd_mutex.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "84b1f1538fadd066cc9877c2276f3fefd8a79bc4", "tree": "453040a994fd35b355c625fa2dc9bbac34acfd53", "parents": [ "69612b9ff44ddc305b727a1f78de2248f9d70bf0" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Sep 25 17:09:42 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:33:46 2012 -0700" }, "message": "mlx4_core: Trivial cleanups to driver log messages\n\nAlso put format string onto one line.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "69612b9ff44ddc305b727a1f78de2248f9d70bf0", "tree": "331ae74fef396b2eff2ae9579fb31e624845b080", "parents": [ "3806d08cf6c42193c10c4963ca2d68f56a088668" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 23 09:18:24 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:33:45 2012 -0700" }, "message": "mlx4_core: Trivial readability fix: \"0X30\" -\u003e \"0x30\"\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "3806d08cf6c42193c10c4963ca2d68f56a088668", "tree": "e483b3f75cdad15363d932aef701ae3f17e81ffc", "parents": [ "47605df953985c2b792ac9f3ddf70d270b89adb8" ], "author": { "name": "Jack Morgenstein", "email": "jackm@dev.mellanox.co.il", "time": "Fri Aug 03 08:40:58 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Sep 30 20:33:44 2012 -0700" }, "message": "IB/mlx4: Create paravirt contexts for VFs when master IB driver initializes\n\nWhen we have VFs and PFs on same host, the VFs are activated within\nthe mlx4_core module before the mlx4_ib kernel module is loaded.\n\nWhen the mlx4_ib module initializes the PF (master), it now creates\nMAD paravirtualization contexts for any VFs that already active.\n\nSigned-off-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" } ], "next": "47605df953985c2b792ac9f3ddf70d270b89adb8" }