Linus Torvalds
151173e8ce
Highlights: ...
- OpenFirmware/DeviceTree support for the Power Supply core: the core now
automatically populates supplied_from hierarchy from the device tree.
With these patches chargers and batteries can now lookup each other
without the board files support shim. Rhyland Klein at NVIDIA did the
work;
- New ST-Ericsson ABX500 hwmon driver. The driver is heavily using the
AB85xx core and depends on some recent changes to it, so that is why the
driver comes through the battery tree. It has an appropriate ack from
the hwmon maintainer (i.e. Guenter Roeck). Martin Persson at ST-Ericsson
and Hongbo Zhang at Linaro authored the driver;
- Final bits to sync AB85xx ST-Ericsson changes into mainline. The changes
touch mfd parts, but these were acked by the appropriate MFD maintainer
(i.e. Samuel Ortiz). Lee Jones at Linaro did most of the work and lead
the submission process.
Minor changes, but still worth mentioning:
- Battery temperature reporting fix for Nokia N900 phones;
- Versatile Express poweroff driver moved into drivers/power/reset/.
- Tree-wise: use devm_kzalloc() where appropriate;
- Tree-wise: dev_pm_ops cleanups/fixes.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJRf1BPAAoJEGgI9fZJve1bwyoP/3Gv+qStzbN7mUtIVEvH3EAe
aVJwlODFzEZjk5xoiw7Dc8PuBE8O948hWOnQyCuUQ8+OfK6SyNIjexPYy3Z25a0F
cX9JMj7rtPWHvxo2q/YuKwBPZoxj/JIPyxwUT7akwXoHAV059fvcy9R1DfFX2Qur
hSP0NXTg+guvEpxGV4bC2l+LWZPmDFK9n0RsorttYaBvsiRDWl0c2TY2byofYlBw
++m/rI8Qgl8db8pKq/WDue62HtMt3kmZj6ZIgej3Wb0+GIRmYHMyPIyAkf82Wlw2
g2sGNPT7cstrSNOozegzJ7UghJObcYDFf10NCgvFMNjmAT1dAwdneQHEWy6Ek7pT
9X3e0LmaFqVbufFp4xFiLkMutsCLLTnGyXIbzs7RkTm3XBVIUqiDWtI6I6X44ohG
6PJn8vUlufu7owXrqFpgSBar2U1vfoQdhInmz4hbQeff0qn2nX/BGNwhxYptZ549
TudsI9WGzJ6fvYQ56zh6+BfiA0FmjhUiSKOtrXImrhxE6gUf3IOJyMQlkxLx5t8D
uuhBmO0J6kDi2lqF6alOEo+UDefJj4mUJn2tnIdis90+lNQlSV02GEtiwFT1zt1z
LFW0xshQkxZ4lMa28h35FB1/Z11ApUOe4Es+OKADDJhAnxdZzXcAwIRyPRRPgdsy
jTnJno+Kxk9wXLcekxVE
=5BdE
-----END PGP SIGNATURE-----
Merge tag 'for-v3.10' of git://git.infradead.org/battery-2.6
Pull battery updates from Anton Vorontsov:
"Highlights:
- OpenFirmware/DeviceTree support for the Power Supply core: the core
now automatically populates supplied_from hierarchy from the device
tree. With these patches chargers and batteries can now lookup
each other without the board files support shim. Rhyland Klein at
NVIDIA did the work
- New ST-Ericsson ABX500 hwmon driver. The driver is heavily using
the AB85xx core and depends on some recent changes to it, so that
is why the driver comes through the battery tree. It has an
appropriate ack from the hwmon maintainer (i.e. Guenter Roeck).
Martin Persson at ST-Ericsson and Hongbo Zhang at Linaro authored
the driver
- Final bits to sync AB85xx ST-Ericsson changes into mainline. The
changes touch mfd parts, but these were acked by the appropriate
MFD maintainer (ie Samuel Ortiz). Lee Jones at Linaro did most of
the work and lead the submission process.
Minor changes, but still worth mentioning:
- Battery temperature reporting fix for Nokia N900 phones
- Versatile Express poweroff driver moved into drivers/power/reset/
- Tree-wide: use devm_kzalloc() where appropriate
- Tree-wide: dev_pm_ops cleanups/fixes"
* tag 'for-v3.10' of git://git.infradead.org/battery-2.6: (112 commits)
pm2301-charger: Fix suspend/resume
charger-manager: Use kmemdup instead of kzalloc + memcpy
power_supply: Populate supplied_from hierarchy from the device tree
power_supply: Add core support for supplied_from
power_supply: Define Binding for power-supplies
rx51_battery: Fix reporting temperature
hwmon: Add ST-Ericsson ABX500 hwmon driver
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
ab8500_{bmdata,fg}: Add const attributes to some data arrays
ab8500_bmdata: Eliminate CamelCase warning of some variables
ab8500_btemp: Make ab8500_btemp_get* interfaces public
goldfish_battery: Use resource_size()
lp8788-charger: Use PAGE_SIZE for the sysfs read operation
max8925_power: Use devm_kzalloc()
da9030_battery: Use devm_kzalloc()
da9052-battery: Use devm_kzalloc()
ds2760_battery: Use devm_kzalloc()
ds2780_battery: Use devm_kzalloc()
gpio-charger: Use devm_kzalloc()
isp1704_charger: Use devm_kzalloc()
...
2013-04-30 15:15:24 -07:00
ARM: PL011: Add support for Rx DMA buffer polling.
2013-03-29 09:20:05 -07:00
Fairly unexciting MTD merge for 3.9:
2013-03-02 16:33:54 -08:00
can: rework skb reserved data handling
2013-01-28 18:17:25 -05:00
libceph: add support for HASHPSPOOL pool flag
2013-02-26 15:03:06 -08:00
clk: arm: sunxi: Add a new clock driver for sunxi SOCs
2013-03-27 08:35:34 -07:00
Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing
2013-01-30 07:54:34 -06:00
extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
2013-02-13 08:35:43 -08:00
powerpc, dma: move bestcomm driver from arch/powerpc/sysdev to drivers/dma
2013-01-03 15:41:20 +01:00
hsi: fix kernel-doc warnings
2013-03-01 13:39:00 -08:00
Input: atmel_mxt_ts - Support for touchpad variant
2013-03-08 16:03:29 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-02-20 11:00:43 -08:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
2013-02-28 18:02:55 -08:00
Highlights:
2013-04-30 15:15:24 -07:00
Main batch of InfiniBand/RDMA changes for 3.9:
2013-02-26 11:41:08 -08:00
mmc: sh_mobile_sdhi: remove unused .pdata field
2013-02-24 14:37:22 -05:00
mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
2013-03-14 12:48:54 +00:00
netfilter: ipset: hash:*net*: nomatch flag not excluded on set resize
2013-04-09 21:04:16 +02:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
2012-11-30 12:01:30 -05:00
nfsd: Store ex_anon_uid and ex_anon_gid as kuids and kgids
2013-02-13 06:16:08 -08:00
pinctrl/pinconfig: add debug interface
2013-04-19 15:45:05 +02:00
Merge branch 'akpm' (incoming from Andrew)
2013-04-29 19:47:50 -07:00
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
2013-04-16 17:38:10 -07:00
UAPI: Remove empty Kbuild files
2013-01-02 17:36:10 -08:00
Merge remote-tracking branch 'regulator/topic/max8952' into v3.9-rc8
2013-04-28 02:13:43 +01:00
sched: move RR_TIMESLICE from sysctl.h to rt.h
2013-02-22 09:20:11 -08:00
spi/tegra: remove unused Tegra platform data header
2013-04-07 10:07:59 +01:00
ssb: implement spurious tone avoidance
2013-04-10 10:31:26 -04:00
Merge branch 'rpcsec_gss-from_cel' into linux-next
2013-04-23 15:40:40 -04:00
usb: phy: tegra: don't call into tegra-ehci directly
2013-04-23 12:50:38 -07:00
PCI/ACPI: Remove support of ACPI PCI subdrivers
2013-04-16 10:27:15 -06:00
gpiolib-acpi: Add ACPI5 event model support to gpio.
2013-01-29 11:47:06 +01:00
aerdrv: Enhanced AER logging
2013-01-03 14:34:06 -08:00
ASN.1: Define indefinite length marker constant
2012-12-14 13:06:41 +10:30
async: rename and redefine async_func_ptr
2013-03-12 13:59:14 -07:00
libata: Use integer return value for atapi_command_packet_set
2013-04-03 19:33:40 -04:00
include: remove __dev* attributes.
2013-01-03 15:57:16 -08:00
ath9k: allow to load EEPROM content via firmware API
2012-12-10 15:49:57 -05:00
atm: add release_cb() callback to vcc
2012-12-02 00:05:12 +00:00
ASoC: atmel-ssc: add phybase in device structure
2012-11-20 18:18:52 +09:00
linux/audit.h: move ptrace.h include to kernel header
2013-01-11 14:54:56 -08:00
bdi: allow block devices to say that they require stable page writes
2013-02-21 17:22:19 -08:00
backlight: add of_find_backlight_by_node()
2012-12-17 17:15:16 -08:00
mm: introduce a common interface for balloon pages mobility
2012-12-11 17:22:26 -08:00
watchdog: bcm47xx_wdt.c: use platform device
2013-03-01 12:47:16 +01:00
fs/exec.c: make bprm_mm_init() static
2013-02-26 02:46:13 -05:00
mm: make snapshotting pages for stable writes a per-bio operation
2013-04-29 15:54:33 -07:00
Merge branch 'blkcg-cfq-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-3.9/core
2013-01-11 19:53:53 +01:00
Revert "block: add missing block_bio_complete() tracepoint"
2013-04-18 09:00:26 -07:00
Input: bma150 - make some defines public and fix some comments
2013-02-15 18:52:45 -08:00
mm, nobootmem: clean-up of free_low_memory_core_early()
2013-04-29 15:54:39 -07:00
bsg: Remove unused function bsg_goose_queue()
2012-12-06 14:33:02 +01:00
Btrfs: move fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h
2013-02-20 09:37:28 -05:00
mm: make snapshotting pages for stable writes a per-bio operation
2013-04-29 15:54:33 -07:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
Add file_ns_capable() helper function for open-time capability checking
2013-04-14 10:06:31 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-04-30 07:43:28 -07:00
clk: add table lookup to mux
2013-03-22 15:18:18 -07:00
clk: composite: rename 'div' references to 'rate'
2013-04-12 11:22:35 -07:00
clk: Properly handle notifier return values
2013-04-10 16:33:53 -07:00
clockevents: Add missing tick_check_broadcast_expired() for CLOCKEVENTS=n
2013-03-22 10:48:33 +01:00
clocksource: Add new feature flag CLOCK_SOURCE_SUSPEND_NONSTOP
2013-03-15 16:50:27 -07:00
coda: Restrict coda messages to the initial user namespace
2013-02-13 06:00:53 -08:00
mm: compaction: make __compact_pgdat() and compact_pgdat() return void
2013-02-23 17:50:10 -08:00
Fix breakage in MIPS siginfo handling
2013-03-19 19:15:52 +01:00
compiler-gcc.h: Add gcc-recommended GCC_VERSION macro
2013-02-21 17:22:15 -08:00
compiler-gcc{3,4}.h: Use GCC_VERSION macro
2013-02-21 17:22:15 -08:00
gcc4: disable __compiletime_object_size for GCC 4.6+
2013-04-29 18:28:13 -07:00
byteorder: allow arch to opt to use GCC intrinsics for byteswapping
2012-12-06 01:22:31 +00:00
kprobes: Move __kprobes definition into compiler.h
2013-04-08 17:28:34 +02:00
sched: add wait_for_completion_io[_timeout]
2013-02-15 16:45:06 +01:00
early_printk: consolidate random copies of identical code
2013-04-29 18:28:13 -07:00
context_tracking: Restore correct previous context state on exception exit
2013-03-07 17:10:11 +01:00
do_coredump(): get rid of pt_regs argument
2012-11-29 00:01:25 -05:00
idle: Implement generic idle function
2013-04-08 17:39:23 +02:00
thermal: cpu cooling: allow module builds
2012-11-22 15:59:52 +08:00
lib: cpu_rmap: avoid flushing all workqueues
2013-01-11 14:54:54 -08:00
cpufreq: Remove unnecessary use of policy->shared_type
2013-02-02 01:29:32 +01:00
cpuidle: remove vestage definition of cpuidle_state_usage.driver_data
2013-02-11 18:49:51 -05:00
cpumask: implement cpumask_parse()
2013-03-12 11:30:04 -07:00
cpuset: remove include of cgroup.h from cpuset.h
2013-03-05 09:33:26 -08:00
cred: Remove tgcred pointer from struct cred
2013-01-09 08:26:53 -08:00
lib, net: make isodigit() public and use it
2013-04-29 18:28:19 -07:00
vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
2013-02-26 02:46:09 -05:00
debug_locks.h: make warning more verbose
2013-04-29 15:54:27 -07:00
debugfs: regset32: make struct debugfs_reg32 pointer const
2013-01-18 15:25:53 -08:00
PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset
2013-04-02 01:28:41 +02:00
dm: add target num_write_bios fn
2013-03-01 22:45:49 +00:00
Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2013-04-29 19:07:40 -07:00
various: Fix spelling of "asynchronous" in comments.
2012-11-19 14:32:13 +01:00
dm kcopyd: introduce configurable throttling
2013-03-01 22:45:49 +00:00
common: DMA-mapping: add DMA_ATTR_FORCE_CONTIGUOUS attribute
2012-11-29 03:30:34 -08:00
dma-buf: implement vmap refcounting in the interface logic
2013-02-27 15:13:36 +05:30
drivers: cma: represent physical addresses as phys_addr_t
2012-12-11 09:28:09 +01:00
dmaengine: add dma_request_slave_channel_compat()
2013-02-27 22:37:34 +05:30
ARM: delete struct sys_timer
2012-12-24 09:36:38 -07:00
dmaengine: dw_dmac: move to generic DMA binding
2013-02-28 09:53:21 +05:30
dynamic_debug: dynamic hex dump
2013-01-17 12:19:09 -08:00
eCryptfs: allow userspace messaging to be disabled
2013-03-03 23:59:59 -08:00
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
x86, efivars: firmware bug workarounds should be in platform code
2013-04-09 11:34:05 +01:00
Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block
2013-02-28 12:52:24 -08:00
default SET_PERSONALITY() in linux/elf.h
2013-02-26 02:46:08 -05:00
net: split eth_mac_addr for better error handling
2013-01-21 14:07:44 -05:00
include/linux/eventfd.h: fix incorrect filename is a comment
2013-02-27 19:10:23 -08:00
Remove spurious _H suffixes from ifdef comments
2013-03-27 13:48:25 +01:00
fat: restructure export_operations
2013-04-29 18:28:40 -07:00
extcon: kernel_doc style fix
2012-11-22 13:43:27 +09:00
f2fs: introduce accessor to retrieve number of dentry slots
2012-12-11 13:43:45 +09:00
fbmon: add of_videomode helpers
2013-01-24 09:04:04 +01:00
kill daemonize()
2012-11-28 21:49:02 -05:00
memory-hotplug: remove /sys/firmware/memmap/X sysfs
2013-02-23 17:50:12 -08:00
Revert "lockdep: check that no locks held at freeze time"
2013-03-31 11:38:33 -07:00
fs: Limit sys_mount to only request filesystem modules.
2013-03-03 19:36:31 -08:00
userns: Don't allow creation if the user is chrooted
2013-03-27 07:49:29 -07:00
FS-Cache: Mark cancellation of in-progress operation
2012-12-20 22:34:00 +00:00
FS-Cache: Provide proper invalidation
2012-12-20 22:04:07 +00:00
drivers/video: fsl-diu-fb: add support for set_gamma ioctls
2012-11-26 13:41:19 -06:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
inotify: convert inotify_add_to_idr() to use idr_alloc_cyclic()
2013-04-29 18:28:41 -07:00
Tracing updates for Linux 3.10
2013-04-29 13:55:38 -07:00
tracing: Compare to 1 instead of zero for is_signed_type()
2013-04-19 17:10:27 -04:00
genalloc: add devres support, allow to find a managed pool by device
2013-04-29 18:28:13 -07:00
block: fix part_pack_uuid() build error
2013-02-26 03:10:52 +11:00
mm: allocate kernel pages to the right memcg
2012-12-18 15:02:12 -08:00
gpio: devm_gpio_* support should not depend on GPIOLIB
2013-01-22 10:23:35 +01:00
irq: Remove IRQ_EXIT_OFFSET workaround
2013-02-22 00:05:07 +01:00
kprobes: Make hash_64() as always inlined
2013-03-18 10:21:23 +01:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
video: Add generic HDMI infoframe helpers
2013-02-22 08:20:05 +01:00
HID: debug: break out hid_dump_report() into hid-debug
2013-04-30 10:09:06 +02:00
hid: iio: rename struct hid_sensor_iio_common to hid_sensor_common
2013-01-06 11:48:11 +00:00
iio: Add Usage IDs for HID time sensors.
2013-01-06 11:41:12 +00:00
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
2013-04-30 10:17:48 +02:00
mm: remove unused memclear_highpage_flush()
2013-02-23 17:50:16 -08:00
hrtimer: Add hrtimer support for CLOCK_TAI
2013-03-22 16:19:59 -07:00
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
mm, hugetlb: include hugepages in meminfo
2013-04-29 15:54:35 -07:00
mm/hugetlb: create hugetlb cgroup file in hugetlb_init
2012-12-18 15:02:15 -08:00
perf: Make perf build for x86 with UAPI disintegration applied
2012-11-19 22:21:03 +00:00
hwmon: Retire SENSORS_LIMIT
2013-01-25 21:03:54 -08:00
drivers/video: add Hyper-V Synthetic Video Frame Buffer Driver
2013-04-29 15:54:26 -07:00
i2c: omap: Remove the OMAP_I2C_FLAG_RESET_REGS_POSTIDLE flag
2012-11-28 11:36:32 +01:00
i2c / ACPI: add ACPI enumeration support
2012-11-23 12:23:40 +01:00
idr: introduce idr_alloc_cyclic()
2013-04-29 18:28:41 -07:00
mac80211: advertise operating mode notification capability
2013-02-15 09:41:42 +01:00
macvlan: add multicast filter
2013-02-06 15:59:47 -05:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
vlan: adjust vlan_set_encap_proto() for its callers
2013-02-23 21:00:06 -05:00
Remove spurious _H suffixes from ifdef comments
2013-03-27 13:48:25 +01:00
ipv6: by default join ff01::1 and in case of forwarding ff01::2 and ff05:2
2013-02-11 14:16:26 -05:00
ipv4: introduce address lifetime
2013-01-29 13:59:57 -05:00
Merge branch 'master' into for-3.9-async
2013-01-23 09:31:01 -08:00
sched/rt: Add <linux/sched/rt.h> header to <linux/init_task.h>
2013-02-19 08:06:01 +01:00
Remove spurious _H suffixes from ifdef comments
2013-03-27 13:48:25 +01:00
lib: cpu_rmap: avoid flushing all workqueues
2013-01-11 14:54:54 -08:00
iommu: Add DOMAIN_ATTR_WINDOWS domain attribute
2013-02-06 10:47:28 +01:00
resource: add release_mem_region_adjustable()
2013-04-29 15:54:37 -07:00
net: Add support for hardware-offloaded encapsulation
2012-12-09 00:20:28 -05:00
ipack: split ipack_device_register() in several functions
2013-03-15 12:23:09 -07:00
ipc: add sysctl to specify desired next object id
2013-01-04 16:11:45 -08:00
ipmi: remove superfluous kernel/userspace explanation
2013-02-27 19:10:21 -08:00
various: Fix spelling of "asynchronous" in comments.
2012-11-19 14:32:13 +01:00
ipv6 flowlabel: Convert np->ipv6_fl_list to RCU.
2013-01-30 22:41:13 -05:00
x86, msi: Use IRQ remapping specific setup_msi_irqs routine
2013-01-28 12:17:25 +01:00
irq_work.h: fix warning when CONFIG_IRQ_WORK=n
2013-03-22 16:41:19 -07:00
irqchip: add basic infrastructure
2013-01-10 11:44:38 -06:00
jbd2: use module parameters instead of debugfs for jbd_debug
2013-02-09 16:29:20 -05:00
timekeeping: Make jiffies_lock internal
2013-03-22 16:20:00 -07:00
Tracing updates for Linux 3.10
2013-04-29 13:55:38 -07:00
cputime: Generic on-demand virtual cputime accounting
2013-01-27 19:23:27 +01:00
x86, kdump: Retore crashkernel= to allocate under 896M
2013-04-17 12:35:33 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-12-16 15:40:50 -08:00
kgdb: remove #include <linux/serial_8250.h> from kgdb.h
2013-02-04 15:35:26 -08:00
kobject: remove CONFIG_HOTPLUG ifdefs
2012-11-28 10:33:03 -08:00
kprobes: Move __kprobes definition into compiler.h
2013-04-08 17:28:34 +02:00
kref: Implement kref_get_unless_zero v3
2012-11-20 16:15:02 +10:00
ksm: remove old stable nodes more thoroughly
2013-02-23 17:50:19 -08:00
KVM: Allow cross page reads and writes from cached translations.
2013-04-07 13:05:35 +03:00
KVM: Allow cross page reads and writes from cached translations.
2013-04-07 13:05:35 +03:00
led: Add dependency on CONFIG_LEDS_TRIGGERS to led_trigger_rename_static()
2012-11-26 14:28:51 -08:00
leds: leds-pwm: Convert to use devm_get_pwm
2013-02-01 17:47:04 -08:00
libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive
2013-04-03 19:33:43 -04:00
Input: increase struct ps2dev cmdbuf[] to 8 bytes
2013-01-06 01:11:25 -08:00
list: Fix double fetch of pointer in hlist_entry_safe()
2013-03-14 13:18:30 -07:00
rcu: Fix hlist_bl_set_first_rcu() annotation
2013-03-12 14:07:41 -07:00
xen-blkfront: drop the use of llist_for_each_entry_safe
2013-02-19 15:17:08 -05:00
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
loop: Limit the number of requests in the bio list
2012-11-30 11:48:05 +01:00
Merge branch 'for-3.8/drivers' of git://git.kernel.dk/linux-block
2012-12-17 13:39:11 -08:00
lib/lzo: Update LZO compression to current upstream version
2013-02-20 19:36:01 +01:00
ARM / highbank: add support for pl320 IPC
2013-02-02 00:01:15 +01:00
math64: New div64_u64_rem helper
2013-03-13 18:03:27 +01:00
mei: bus: Add device enabling and disabling API
2013-04-08 16:57:15 -07:00
x86, ACPI, mm: Revert movablemem_map support
2013-03-02 09:34:39 -08:00
mm: refactor inactive_file_is_low() to use get_lru_size()
2013-02-23 17:50:20 -08:00
mm, hotplug: avoid compiling memory hotremove functions when disabled
2013-04-29 15:54:37 -07:00
mm, hotplug: avoid compiling memory hotremove functions when disabled
2013-04-29 15:54:37 -07:00
mm: mempolicy: Convert shared_policy mutex to spinlock
2013-01-02 17:32:13 -08:00
drivers/net/phy/micrel_phy: Add support for new PHYs
2013-01-28 18:42:10 -05:00
mm: remove offlining arg to migrate_pages
2013-02-23 17:50:19 -08:00
[SCSI] miscdevice: Adding support for MPT3SAS_MINOR(222)
2012-12-01 10:07:54 +00:00
mm: replace hardcoded 3% with admin_reserve_pages knob
2013-04-29 15:54:36 -07:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs"
2013-03-28 17:45:51 -07:00
mm: fix wrong comments about anon_vma lock
2013-02-05 20:38:48 +11:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
vfs: Add a user namespace reference from struct mnt_namespace
2012-11-19 05:59:19 -08:00
mei: bus: Initial MEI Client bus type implementation
2013-03-29 08:35:47 -07:00
module: constify within_module_*
2013-01-21 17:18:20 +10:30
moduleparam: use __UNIQUE_ID()
2012-12-14 13:06:40 +10:30
vfs: Add a mount flag to lock read only bind mounts
2013-03-27 07:50:04 -07:00
mcast: define and use MRT[6]_MAX in ip[6]_mroute_opt()
2013-01-21 13:55:14 -05:00
mcast: define and use MRT[6]_MAX in ip[6]_mroute_opt()
2013-01-21 13:55:14 -05:00
selftests: IPC message queue copy feature test
2013-01-04 16:11:45 -08:00
PCI: Remove "extern" from function declarations
2013-04-23 09:50:30 -06:00
mutex: Queue mutex spinners with MCS lock to reduce cacheline contention
2013-04-19 09:33:36 +02:00
ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
2013-03-19 11:07:58 +08:00
namei.h: include errno.h
2012-12-25 18:45:06 -05:00
net: rename random32 to prandom
2013-04-29 18:28:44 -07:00
v4 GRE: Add TCP segmentation offload for GRE
2013-02-15 15:17:11 -05:00
net: count hw_addr syncs so that unsync works properly.
2013-04-05 00:18:46 -04:00
netpoll: Fix __netpoll_rcu_free so that it can hold the rtnl lock
2013-02-11 19:19:33 -05:00
nfsd: Handle kuids and kgids in the nfs4acl to posix_acl conversion
2013-02-13 06:16:06 -08:00
NFS: Add functionality to allow waiting on all outstanding reads to complete
2013-04-08 22:12:33 -04:00
NFSv4.1: Set the RPC_CLNT_CREATE_INFINITE_SLOTS flag for NFSv4.1 transports
2013-04-14 12:59:28 -04:00
nfs: Convert idmap to use kuids and kgids
2013-02-13 06:15:29 -08:00
Merge branch 'rpcsec_gss-from_cel' into linux-next
2013-04-23 15:40:40 -04:00
mm: cleanup register_node()
2012-12-11 17:22:27 -08:00
numa: add CONFIG_MOVABLE_NODE for movable-dedicated node
2012-12-12 17:38:34 -08:00
include/linux/memory.h: implement register_hotmemory_notifier()
2013-04-29 15:54:36 -07:00
userns: Implement unshare of the user namespace
2012-11-20 04:18:14 -08:00
PCI-Express Non-Transparent Bridge Support
2013-01-17 19:11:14 -08:00
of: Create function for counting number of phandles in a property
2013-02-13 10:09:31 +00:00
of/address: sparc: Declare of_iomap as an extern function for sparc again
2012-11-23 22:01:15 +00:00
dmaengine: fix !of_dma compilation warning
2013-01-07 22:05:02 -08:00
gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
2013-02-13 10:11:53 +00:00
of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined
2012-12-11 17:30:16 +00:00
of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS
2012-12-19 16:15:17 +00:00
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
2012-11-30 08:41:50 -08:00
ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
2012-11-20 10:04:29 -08:00
mm, oom: fix race when specifying a thread as the oom origin
2012-12-11 17:22:27 -08:00
openvswitch: add skb mark matching and set action
2012-11-26 11:33:18 -08:00
PM / OPP: fix condition for empty of_init_opp_table()
2013-02-23 00:30:08 +01:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
s390/mm: implement software dirty bits
2013-02-14 15:55:23 +01:00
mm: remove MIGRATE_ISOLATE check in hotpath
2013-02-23 17:50:15 -08:00
vm: adjust ifdef for TINY_RCU
2013-04-29 15:54:28 -07:00
constify path_get/path_put and fs_struct.c stuff
2013-03-01 23:51:07 -05:00
PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
2013-04-12 16:52:01 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
PCI changes for the v3.10 merge window:
2013-04-29 09:30:25 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-04-30 08:42:45 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
percpu_rw_semaphore: add lockdep annotations
2012-12-17 17:15:18 -08:00
percpu_counter.h: comment code for better readability
2013-02-05 11:54:06 +01:00
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
2013-04-08 11:43:30 +02:00
net: phy: remove flags argument from phy_{attach, connect, connect_direct}
2013-01-14 15:11:50 -05:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
pidns: Stop pid allocation when init dies
2012-12-25 16:10:05 -08:00
driver core: platform_device.h: fix checkpatch errors and warnings
2013-03-29 09:14:16 -07:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
pm2301-charger: Adjust interrupt handler behavior
2013-03-07 12:35:51 +08:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
posix timers: Allocate timer id per process (v2)
2013-04-17 20:51:01 +02:00
power_supply: Populate supplied_from hierarchy from the device tree
2013-04-16 18:51:16 -07:00
pps: Add pps_lookup_dev() function
2013-02-13 09:40:35 -08:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
include/linux/printk.h: include stdarg.h
2013-04-29 18:28:13 -07:00
procfs: add proc_remove_subtree()
2013-04-09 14:09:17 -04:00
profiling: Remove unused timer hook
2013-01-24 15:37:26 +01:00
pstore: Avoid deadlock in panic and emergency-restart path
2013-01-11 10:20:50 -08:00
pstore: remove __dev* attributes.
2013-01-03 15:57:14 -08:00
ia64: kill thread_matches(), unexport ptrace_check_attach()
2013-01-20 12:26:05 -08:00
time: export time information for KVM pvclock
2012-11-27 23:29:12 -02:00
pwm: Changes for v3.9-rc1
2013-02-26 09:34:29 -08:00
spi/pxa2xx: add support for Intel Low Power Subsystem SPI
2013-02-08 13:14:40 +00:00
quota: autoload the quota_v2 module for QFMT_VFS_V1 quota format
2013-01-24 23:24:56 -05:00
mm/shmem.c: remove an ifdef
2013-04-29 15:54:28 -07:00
soreuseport: infrastructure
2013-01-23 13:44:00 -05:00
lib/rbtree.c: avoid the use of non-static __always_inline
2013-01-11 14:54:56 -08:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
rcu: Fix hlist_bl_set_first_rcu() annotation
2013-03-12 14:07:41 -07:00
rcu: Make RCU_FAST_NO_HZ take advantage of numbered callbacks
2013-03-26 08:04:51 -07:00
regmap: core: Provide regmap_can_raw_write() operation
2013-03-27 13:03:39 +00:00
Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-04-29 19:14:20 -07:00
tracing/ring-buffer: Move poll wake ups into ring buffer code
2013-03-15 00:34:50 -04:00
rapidio: fix kernel-doc warnings
2012-11-16 14:33:04 -08:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register()
2013-04-29 18:28:22 -07:00
lockdep, rwsem: fix down_write_nest_lock() if !CONFIG_DEBUG_LOCK_ALLOC
2013-01-16 12:13:20 -08:00
lib/scatterlist: use page iterator in the mapping iterator
2013-02-27 19:10:10 -08:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-04-30 08:15:40 -07:00
lsm: add the missing documentation for the security_skb_owned_by() hook
2013-04-10 15:40:39 -04:00
seqlock: Use seqcount infrastructure
2013-02-19 08:43:34 +01:00
serial: 8250: Add support for dmaengine
2013-01-15 23:03:00 -08:00
pps: Move timestamp read into PPS code proper
2013-02-13 10:13:58 -08:00
tty: serial/samsung: make register definitions global
2013-04-11 13:14:36 -07:00
mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB
2012-12-11 17:22:25 -08:00
Fix breakage in MIPS siginfo handling
2013-03-19 19:15:52 +01:00
netfilter: don't reset nf_trace in nf_reset()
2013-04-05 15:38:10 -04:00
slab: propagate tunable values
2012-12-18 15:02:14 -08:00
slab/slub: struct memcg_params
2012-12-18 15:02:13 -08:00
slub: slub-specific propagation changes
2012-12-18 15:02:14 -08:00
smp: make smp_call_function_many() use logic similar to smp_call_function_single()
2013-02-21 17:22:20 -08:00
stop_machine: Mark per cpu stopper enabled early
2013-02-26 22:25:17 +01:00
net: phy: smsc: force all capable mode if the phy is started in powerdown mode
2012-12-07 12:48:00 -05:00
VSOCK: Introduce VM Sockets
2013-02-10 19:41:08 -05:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
srcu: Remove checks preventing idle CPUs from calling srcu_read_lock()
2013-02-07 15:15:00 -08:00
SSBI: Remove MSM_ prefix from SSBI drivers
2013-03-25 10:39:40 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
rtc: stmp3xxx: add wdt-accessor function
2013-03-01 12:40:36 +01:00
string: introduce helper to get base file name from given path
2012-12-17 17:15:17 -08:00
pps: Fix build breakage from decoupling pps from tty
2013-02-13 12:15:50 -08:00
ARM: delete struct sys_timer
2012-12-24 09:36:38 -07:00
PM: Introduce suspend state PM_SUSPEND_FREEZE
2013-02-09 22:30:44 +01:00
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
x86, kdump: Set crashkernel_low automatically
2013-04-17 12:35:32 -07:00
burying unused conditionals
2013-02-14 09:21:15 -05:00
sysctl: Pass useful parameters to sysctl permissions
2012-11-18 20:30:55 -05:00
sysfs: Functions for adding/removing symlinks to/from attribute groups
2013-01-25 21:51:13 +01:00
tcp: adding a per-socket timestamp offset
2013-02-13 13:22:15 -05:00
ARM: tegra: add function to read chipid
2013-01-28 11:19:06 -07:00
thermal: shorten too long mcast group name
2013-03-20 17:56:58 -04:00
fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
2012-12-18 15:02:13 -08:00
Merge branch 'nohz/printk-v8' into irq/core
2013-02-05 00:48:46 +01:00
timekeeping: Add CLOCK_TAI clockid
2013-03-22 16:19:59 -07:00
timekeeping: Store cycle_last value in timekeeper struct as well
2013-04-04 13:18:31 -07:00
ntp: Move do_adjtimex() and hardpps() functions to timekeeping.c
2013-04-04 13:18:14 -07:00
tracing: Add "uptime" trace clock that uses jiffies
2013-03-15 00:36:09 -04:00
cputime: Use accessors to read task cputime stats
2013-01-27 19:23:31 +01:00
tty: Don't reenable already enabled ldisc
2013-03-18 16:44:02 -07:00
tty: Document required behavior of tty driver close()
2013-02-04 15:40:28 -08:00
TTY: switch tty_schedule_flip
2013-01-15 22:43:15 -08:00
tty: Fix checkpatch errors in tty_ldisc.h
2013-03-18 16:14:55 -07:00
mm, oom: fix race when specifying a thread as the oom origin
2012-12-11 17:22:27 -08:00
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
udp: add encap_destroy callback
2013-03-20 12:10:38 -04:00
uretprobes: Limit the depth of return probe nestedness
2013-04-13 15:31:58 +02:00
USB: remove CONFIG_USB_SUSPEND option
2013-03-28 11:10:22 -07:00
userns: Restrict when proc and sysfs can be mounted
2013-03-27 07:50:08 -07:00
proc: Usable inode numbers for the namespace file descriptors.
2012-11-20 04:19:49 -08:00
arm: vexpress: Decouple vexpress-poweroff implementation from machine_desc
2013-03-21 15:17:40 +00:00
Fix misspellings of "whether" in comments.
2012-11-19 14:31:35 +01:00
virtio: Add module driver macro for virtio drivers.
2013-02-13 17:00:32 +10:30
mm: don't wait on congested zones in balance_pgdat()
2013-02-23 17:50:15 -08:00
kexec, vmalloc: export additional vmalloc layer information
2013-04-29 15:54:34 -07:00
memcg: add memory.pressure_level events
2013-04-29 15:54:38 -07:00
mm: remove CONFIG_HOTPLUG ifdefs
2013-04-29 15:54:37 -07:00
VMCI: Some header and config files.
2013-01-08 16:15:57 -08:00
VMCI: Some header and config files.
2013-01-08 16:15:57 -08:00
Merge branch 'console-fixes' into drm-next
2013-02-08 12:13:43 +10:00
cputime: Safely read cputime of full dynticks CPUs
2013-01-27 20:35:47 +01:00
wait: add wait_event_lock_irq() interface
2012-11-30 11:47:57 +01:00
wanrouter: delete now orphaned header content, files/drivers
2013-01-31 19:56:35 -05:00
watchdog: core: dt: add support for the timeout-sec dt property
2013-03-01 12:48:36 +01:00
wlcore: move wl12xx_platform_data up and make it truly optional
2013-02-08 10:05:02 +02:00
workqueue: update sysfs interface to reflect NUMA awareness and a kernel param to disable NUMA affinity
2013-04-01 11:23:38 -07:00
vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them
2013-01-12 10:47:43 +08:00
151173e8ce