]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 30 Sep 2011 03:22:39 +0000 (13:22 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Fri, 30 Sep 2011 03:16:26 +0000 (13:16 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Fri, 30 Sep 2011 03:10:44 +0000 (13:10 +1000)]
Merge remote-tracking branch 'kvm/kvm-updates/3.2'
Stephen Rothwell [Fri, 30 Sep 2011 03:04:01 +0000 (13:04 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 30 Sep 2011 02:57:23 +0000 (12:57 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/iommu/Makefile
Stephen Rothwell [Fri, 30 Sep 2011 02:55:59 +0000 (12:55 +1000)]
Merge remote-tracking branch 'gpio/gpio/next'
Stephen Rothwell [Fri, 30 Sep 2011 02:54:40 +0000 (12:54 +1000)]
Merge remote-tracking branch 'spi/spi/next'
Stephen Rothwell [Fri, 30 Sep 2011 02:52:19 +0000 (12:52 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Fri, 30 Sep 2011 02:50:59 +0000 (12:50 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 02:49:40 +0000 (12:49 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Fri, 30 Sep 2011 02:46:44 +0000 (12:46 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 02:45:18 +0000 (12:45 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 02:38:46 +0000 (12:38 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Fri, 30 Sep 2011 02:34:30 +0000 (12:34 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig
Stephen Rothwell [Fri, 30 Sep 2011 02:27:56 +0000 (12:27 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Fri, 30 Sep 2011 02:26:28 +0000 (12:26 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 30 Sep 2011 02:26:16 +0000 (12:26 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 30 Sep 2011 02:25:34 +0000 (12:25 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Fri, 30 Sep 2011 02:18:48 +0000 (12:18 +1000)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Fri, 30 Sep 2011 02:17:23 +0000 (12:17 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 02:16:03 +0000 (12:16 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Stephen Rothwell [Fri, 30 Sep 2011 02:04:25 +0000 (12:04 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Fri, 30 Sep 2011 02:03:01 +0000 (12:03 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Fri, 30 Sep 2011 02:01:31 +0000 (12:01 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/mach-u300/include/mach/irqs.h
Stephen Rothwell [Fri, 30 Sep 2011 01:59:44 +0000 (11:59 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:53:08 +0000 (11:53 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:52:59 +0000 (11:52 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:51:36 +0000 (11:51 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
Stephen Rothwell [Fri, 30 Sep 2011 01:51:25 +0000 (11:51 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Fri, 30 Sep 2011 01:49:32 +0000 (11:49 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 30 Sep 2011 01:47:56 +0000 (11:47 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Fri, 30 Sep 2011 01:45:45 +0000 (11:45 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:43:53 +0000 (11:43 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 30 Sep 2011 01:42:32 +0000 (11:42 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Fri, 30 Sep 2011 01:41:13 +0000 (11:41 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Fri, 30 Sep 2011 01:39:44 +0000 (11:39 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:37:40 +0000 (11:37 +1000)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
Stephen Rothwell [Fri, 30 Sep 2011 01:31:55 +0000 (11:31 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 30 Sep 2011 01:30:35 +0000 (11:30 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
Stephen Rothwell [Fri, 30 Sep 2011 01:28:00 +0000 (11:28 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
Stephen Rothwell [Fri, 30 Sep 2011 01:26:15 +0000 (11:26 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Stephen Rothwell [Fri, 30 Sep 2011 01:20:11 +0000 (11:20 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/s390/cio/qdio_main.c
net/batman-adv/soft-interface.c
Stephen Rothwell [Fri, 30 Sep 2011 01:17:02 +0000 (11:17 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 30 Sep 2011 01:14:53 +0000 (11:14 +1000)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Fri, 30 Sep 2011 01:14:49 +0000 (11:14 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Fri, 30 Sep 2011 01:14:43 +0000 (11:14 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Fri, 30 Sep 2011 01:13:24 +0000 (11:13 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:12:00 +0000 (11:12 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:10:42 +0000 (11:10 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 30 Sep 2011 01:10:37 +0000 (11:10 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:09:08 +0000 (11:09 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:07:25 +0000 (11:07 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 30 Sep 2011 01:06:04 +0000 (11:06 +1000)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Fri, 30 Sep 2011 01:04:52 +0000 (11:04 +1000)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Fri, 30 Sep 2011 01:03:32 +0000 (11:03 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 30 Sep 2011 01:02:21 +0000 (11:02 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 30 Sep 2011 01:01:05 +0000 (11:01 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Fri, 30 Sep 2011 00:59:46 +0000 (10:59 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 30 Sep 2011 00:58:25 +0000 (10:58 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:56:57 +0000 (10:56 +1000)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Fri, 30 Sep 2011 00:55:43 +0000 (10:55 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:54:16 +0000 (10:54 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:48:08 +0000 (10:48 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:46:54 +0000 (10:46 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 30 Sep 2011 00:45:39 +0000 (10:45 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 30 Sep 2011 00:44:12 +0000 (10:44 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:43:00 +0000 (10:43 +1000)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Fri, 30 Sep 2011 00:41:49 +0000 (10:41 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 30 Sep 2011 00:40:36 +0000 (10:40 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 30 Sep 2011 00:39:23 +0000 (10:39 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Fri, 30 Sep 2011 00:38:04 +0000 (10:38 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 30 Sep 2011 00:31:33 +0000 (10:31 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 30 Sep 2011 00:30:16 +0000 (10:30 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Fri, 30 Sep 2011 00:23:46 +0000 (10:23 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 30 Sep 2011 00:22:26 +0000 (10:22 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:21:07 +0000 (10:21 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:19:56 +0000 (10:19 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:18:43 +0000 (10:18 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Fri, 30 Sep 2011 00:17:25 +0000 (10:17 +1000)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Fri, 30 Sep 2011 00:16:07 +0000 (10:16 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:14:53 +0000 (10:14 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Fri, 30 Sep 2011 00:11:31 +0000 (10:11 +1000)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
drivers/gpio/Makefile
Stephen Rothwell [Fri, 30 Sep 2011 00:10:08 +0000 (10:10 +1000)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/Makefile
Stephen Rothwell [Fri, 30 Sep 2011 00:08:45 +0000 (10:08 +1000)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Fri, 30 Sep 2011 00:07:30 +0000 (10:07 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/l2cc.txt
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot
arch/arm/mm/cache-l2x0.c
arch/arm/mm/dma-mapping.c
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Thu, 29 Sep 2011 23:58:32 +0000 (09:58 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/mm/mmu.c
Stephen Rothwell [Thu, 29 Sep 2011 23:57:13 +0000 (09:57 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 29 Sep 2011 23:51:01 +0000 (09:51 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'
Rafael J. Wysocki [Thu, 29 Sep 2011 20:29:44 +0000 (22:29 +0200)]
PM / QoS: Add function dev_pm_qos_read_value() (v3)
To read the current PM QoS value for a given device we need to
make sure that the device's power.constraints object won't be
removed while we're doing that. For this reason, put the
operation under dev->power.lock and acquire the lock
around the initialization and removal of power.constraints.
Moreover, since we're using the value of power.constraints to
determine whether or not the object is present, the
power.constraints_state field isn't necessary any more and may be
removed. However, dev_pm_qos_add_request() needs to check if the
device is being removed from the system before allocating a new
PM QoS constraints object for it, so make it use the
power.power_state field of struct device for this purpose.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Rafael J. Wysocki [Thu, 29 Sep 2011 20:08:36 +0000 (22:08 +0200)]
Merge branch 'pm-assorted' into pm-test
* pm-assorted:
PM / Hibernate: Fix typo in a kerneldoc comment
PM / Hibernate: Freeze kernel threads after preallocating memory
PM: Update the policy on default wakeup settings
PM / VT: Cleanup #if defined uglyness and fix compile error
PM / Suspend: Off by one in pm_suspend()
PM / Hibernate: Include storage keys in hibernation image on s390
PM: Fix build issue in main.c for CONFIG_PM_SLEEP unset
PM / Suspend: Add statistics debugfs file for suspend to RAM
Conflicts:
kernel/power/Makefile
Rafael J. Wysocki [Thu, 29 Sep 2011 20:08:00 +0000 (22:08 +0200)]
Merge branch 'pm-qos' into pm-test
* pm-qos:
PM QoS: Add global notification mechanism for device constraints
PM QoS: Implement per-device PM QoS constraints
PM QoS: Generalize and export constraints management code
PM QoS: Reorganize data structs
PM QoS: Code reorganization
PM QoS: Minor clean-ups
PM QoS: Move and rename the implementation files
Rafael J. Wysocki [Thu, 29 Sep 2011 20:07:56 +0000 (22:07 +0200)]
Merge branch 'pm-domains' into pm-test
* pm-domains:
PM / Domains: Split device PM domain data into base and need_restore
ARM: mach-shmobile: sh7372 sleep warning fixes
ARM: mach-shmobile: sh7372 A3SM support
ARM: mach-shmobile: sh7372 generic suspend/resume support
PM / Domains: Preliminary support for devices with power.irq_safe set
PM: Move clock-related definitions and headers to separate file
PM / Domains: Use power.sybsys_data to reduce overhead
PM: Reference counting of power.subsys_data
PM: Introduce struct pm_subsys_data
ARM / shmobile: Make A3RV be a subdomain of A4LC on SH7372
PM / Domains: Rename argument of pm_genpd_add_subdomain()
PM / Domains: Rename GPD_STATE_WAIT_PARENT to GPD_STATE_WAIT_MASTER
PM / Domains: Allow generic PM domains to have multiple masters
PM / Domains: Add "wait for parent" status for generic PM domains
PM / Domains: Make pm_genpd_poweron() always survive parent removal
PM / Domains: Do not take parent locks to modify subdomain counters
PM / Domains: Implement subdomain counters as atomic fields
Rafael J. Wysocki [Thu, 29 Sep 2011 20:07:49 +0000 (22:07 +0200)]
Merge branch 'pm-runtime' into pm-test
* pm-runtime:
PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
PM / Runtime: Replace dev_dbg() with trace_rpm_*()
PM / Runtime: Introduce trace points for tracing rpm_* functions
PM / Runtime: Don't run callbacks under lock for power.irq_safe set
USB: Add wakeup info to debugging messages
PM / Runtime: pm_runtime_idle() can be called in atomic context
PM / Runtime: Add macro to test for runtime PM events
PM / Runtime: Add might_sleep() to runtime PM functions
Ming Lei [Thu, 29 Sep 2011 20:07:23 +0000 (22:07 +0200)]
PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
Do not build kernel/trace/rpm-traces.c if CONFIG_PM_RUNTIME is not
set, which avoids a build failure.
[rjw: Added the changelog and modified the subject slightly.]
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
David S. Miller [Thu, 29 Sep 2011 19:41:20 +0000 (15:41 -0400)]
Merge git://github.com/Jkirsher/net-next
Oliver Hartkopp [Thu, 29 Sep 2011 19:33:47 +0000 (15:33 -0400)]
can bcm: fix incomplete tx_setup fix
The commit
aabdcb0b553b9c9547b1a506b34d55a764745870 ("can bcm: fix tx_setup
off-by-one errors") fixed only a part of the original problem reported by
Andre Naujoks. It turned out that the original code needed to be re-ordered
to reduce complexity and to finally fix the reported frame counting issues.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jonathan Lallinger [Thu, 29 Sep 2011 07:58:41 +0000 (07:58 +0000)]
RDSRDMA: Fix cleanup of rds_iw_mr_pool
In the rds_iw_mr_pool struct the free_pinned field keeps track of
memory pinned by free MRs. While this field is incremented properly
upon allocation, it is never decremented upon unmapping. This would
cause the rds_rdma module to crash the kernel upon unloading, by
triggering the BUG_ON in the rds_iw_destroy_mr_pool function.
This change keeps track of the MRs that become unpinned, so that
free_pinned can be decremented appropriately.
Signed-off-by: Jonathan Lallinger <jonathan@ogc.us>
Signed-off-by: Steve Wise <swise@ogc.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Roy.Li [Wed, 28 Sep 2011 19:51:54 +0000 (19:51 +0000)]
net: Documentation: Fix type of variables
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Michael Riesch [Thu, 29 Sep 2011 04:06:26 +0000 (04:06 +0000)]
usbnet: add timestamping support
In order to make USB-to-Ethernet-adapters (depending on usbnet) support
timestamping, the "skb_defer_rx_timestamp" and "skb_tx_timestamp" function
calls are added.
Signed-off-by: Michael Riesch <michael@riesch.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
Xiao Jiang [Thu, 29 Sep 2011 02:15:57 +0000 (02:15 +0000)]
net/fec: add poll controller function for fec nic
Add poll controller function for fec nic.
Signed-off-by: Xiao Jiang <jgq516@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>