Tejun Heo 13ccb93f41 Merge branch 'driver-core-linus' into driver-core-next ...

a8b14744429f ("sysfs: give different locking key to regular and bin
files") in driver-core-linus modifies sysfs_open_file() so that it
gives out different locking classes to sysfs_open_files depending on
whether the file is bin or not.  Due to the massive kernfs
reorganization in driver-core-next, this naturally causes merge
conflict in fs/sysfs/file.c.

Due to the way things are split between kernfs and sysfs in
driver-core-next, the same fix can't easily be applied to
driver-core-next.  This merge simply ignores the offending commit.  A
following patch will implement a separate fix for the issue.

Signed-off-by: Tejun Heo <tj@kernel.org>

2013-12-10 08:44:37 -05:00

..

power

Merge branches 'pm-cpuidle' and 'pm-cpufreq'

2013-12-06 02:17:59 +01:00

regmap

Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next

2013-10-28 13:01:35 -07:00

attribute_container.c

drivers: avoid format string in dev_set_name

2013-07-03 16:07:41 -07:00

base.h

driver core: bus_type: add drv_groups

2013-08-12 15:33:31 -07:00

bus.c

driver-core: remove struct bus_type.drv_attrs

2013-09-28 10:18:20 -07:00

class.c

sysfs: make attr namespace interface less convoluted

2013-09-26 14:50:01 -07:00

core.c

driver core: fix device_create() error path

2013-12-08 18:25:10 -08:00

cpu.c

hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock()

2013-09-30 19:55:51 +02:00

dd.c

PM / runtime: Use pm_runtime_put_sync() in __device_release_driver()

2013-11-07 19:13:49 +01:00

devres.c

devres: restore zeroing behavior of devres_alloc()

2013-10-25 05:46:27 +01:00

devtmpfs.c

locks: break delegations on any attribute modification

2013-11-09 00:16:44 -05:00

dma-buf.c

dma-buf: Expose buffer size to userspace (v2)

2013-09-10 11:36:45 +05:30

dma-coherent.c

drivers: dma-coherent: Fix typo in dma_mmap_from_coherent documentation

2012-10-23 14:05:32 +02:00

dma-contiguous.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2013-11-15 16:47:22 -08:00

dma-mapping.c

[media] dma-mapping: fix dma_common_get_sgtable() conditional compilation

2012-11-27 09:42:31 -02:00

driver.c

driver core: add #include <linux/sysfs.h> to core files.

2013-08-27 10:24:15 -07:00

firmware_class.c

firmware: Suppress fallback warnings when CONFIG_FW_LOADER_USER_HELPER=n

2013-12-08 18:22:33 -08:00

firmware.c

…

hypervisor.c

drivers/base: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required.

2011-10-31 19:31:38 -04:00

init.c

driver-core: implement 'sysdev' functionality for regular devices and buses

2011-12-14 14:29:38 -08:00

isa.c

dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)

2009-04-07 08:31:12 -07:00

Kconfig

Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next

2013-07-15 11:13:54 +02:00

Makefile

Merge remote-tracking branch 'origin/next' into kvm-ppc-next

2013-08-29 00:41:59 +02:00

map.c

…

memory.c

driver core: Release device_hotplug_lock when store_mem_state returns EINVAL

2013-10-16 18:42:41 -07:00

module.c

driver core: module.c: Use kasprintf

2010-05-21 09:37:29 -07:00

node.c

thp: account anon transparent huge pages into NR_ANON_PAGES

2013-09-12 15:38:03 -07:00

pinctrl.c

drivers: pinctrl sleep and idle states in the core

2013-06-16 11:56:52 +02:00

platform.c

ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node

2013-11-14 23:14:43 +01:00

reservation.c

reservation: cross-device reservation support, v4

2013-06-28 12:02:15 +10:00

soc.c

mode_t whack-a-mole: ->is_visible() returns umode_t...

2012-05-29 23:28:42 -04:00

syscore.c

PM: Reintroduce dropped call to check_wakeup_irqs

2011-07-11 10:51:49 +02:00

topology.c

cpu topology: remove stale arch_provides_topology_pointers and define_siblings_show_map/list()

2013-07-29 13:12:45 -07:00

transport_class.c

drivers/base: transport_class explicitly requires EXPORT_SYMBOL

2011-10-31 19:31:15 -04:00