Changes in sysfs-devices

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/Documentation/ABI/testing/sysfs-devices

9a64e8e0ace51b309fdcff4b4754b3649250382a - Merge tag 'v3.5-rc1'

Fri, 15 Jun 2012 21:32:04 +0200

Merge tag 'v3.5-rc1'Linux 3.5-rc1Conflicts: net/ceph/messenger.c List of files: /linux/Documentation/ABI/testing/sysfs-devices

e644dae645e167d154c0526358940986682a72b0 - Merge branch 'next' into for-linus

Thu, 24 May 2012 10:13:01 +0200

Merge branch 'next' into for-linus List of files: /linux/Documentation/ABI/testing/sysfs-devices

57b8628bb0ac4e47c806e45c5bbd89282e93869b - Merge commit 'v3.4-rc4' into next

Sun, 22 Apr 2012 08:28:35 +0200

Merge commit 'v3.4-rc4' into next List of files: /linux/Documentation/ABI/testing/sysfs-devices

681e4a5e13c1c8315694eb4f44e0cdd84c9082d2 - Merge commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81' into stable/for-linus-3.4

Wed, 18 Apr 2012 21:52:50 +0200

Merge commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81' into stable/for-linus-3.4* commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81': (14566 commits) cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS sparc64: Eliminate obsolete __handle_softirq() function sparc64: Fix bootup crash on sun4v. kconfig: delete last traces of __enabled_ from autoconf.h Revert "kconfig: fix __enabled_ macros definition for invisible and un-selected symbols" kconfig: fix IS_ENABLED to not require all options to be defined irq_domain: fix type mismatch in debugfs output format staging: android: fix mem leaks in __persistent_ram_init() staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl() staging: iio: hmc5843: Fix crash in probe function. panic: fix stack dump print on direct call to panic() drivers/rtc/rtc-pl031.c: enable clock on all ST variants Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()" hugetlb: fix race condition in hugetlb_fault() drivers/rtc/rtc-twl.c: use static register while reading time drivers/rtc/rtc-s3c.c: add placeholder for driver private data drivers/rtc/rtc-s3c.c: fix compilation error MAINTAINERS: add PCDP console maintainer memcg: do not open code accesses to res_counter members drivers/rtc/rtc-efi.c: fix section mismatch warning ... List of files: /linux/Documentation/ABI/testing/sysfs-devices

6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e - Merge branch 'perf/core' into perf/uprobes

Sat, 14 Apr 2012 13:18:27 +0200

Merge branch 'perf/core' into perf/uprobesMerge in latest upstream (and the latest perf development tree),to prepare for tooling changes, and also to pick up v3.4 MMchanges that the uprobes code needs to take care of.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-devices

3423166fdbc2444bf3a4a27af1d7508364a17be7 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Fri, 13 Apr 2012 22:32:07 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc List of files: /linux/Documentation/ABI/testing/sysfs-devices

659c36fcda403013a01b85da07cf2d9711e6d6c7 - Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Fri, 13 Apr 2012 09:50:21 +0200

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/coreFixes and improvements for perf/core:. Overhaul the tools/ makefiles, gluing them to the top level Makefile, from Borislav Petkov.. Move the UI files from tools/perf/util/ui/ to tools/perf/ui/. Also move the GTK+ browser to tools/perf/ui/gtk/, from Namhyung Kim.. Only fallback to sw cycles counter on ENOENT for the hw cycles, from Robert Richter. Trivial fixes from Robert Richter. Handle the autogenerated bison/flex files better, from Namhyung and Jiri Olsa.. Navigate jump instructions in the annotate browser, just press enter or ->, still needs support for a jump navigation history, i.e. to go back.. Search string in the annotate browser: same keys as vim: / forward n next backward/forward ? backward. Clarify number of events/samples in the report header, from Ashay RaneSigned-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-devices

586c7ecc78949f03c9f31735f4935abef38f8f2b - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next

Thu, 12 Apr 2012 23:07:13 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next List of files: /linux/Documentation/ABI/testing/sysfs-devices

d968370ee7ce22583ab741961f0044d2922aa1a1 - Merge remote branch 'wireless-next/master' into ath6kl-next

Thu, 12 Apr 2012 08:45:11 +0200

Merge remote branch 'wireless-next/master' into ath6kl-next List of files: /linux/Documentation/ABI/testing/sysfs-devices

e75d660672ddd11704b7f0fdb8ff21968587b266 - Merge branch 'master' into for-next

Sun, 08 Apr 2012 21:48:52 +0200

Merge branch 'master' into for-nextMerge with latest Linus' tree, as I have incoming patchesthat fix code that is newer than current HEAD of for-next.Conflicts: drivers/net/ethernet/realtek/r8169.c List of files: /linux/Documentation/ABI/testing/sysfs-devices

c38f62b08d800104fa9b0e9d6e9141459986c06d - Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Sat, 07 Apr 2012 12:28:00 +0200

Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: fixes for 3.4A bunch of driver-specific fixes and one generic fix for the new supportfor platform DAPM contexts - we were picking the wrong default for theidle_bias_off setting which was meaning we weren't actually achievingany useful runtime PM on platform devices. List of files: /linux/Documentation/ABI/testing/sysfs-devices

eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c - Merge branches 'idle-fix' and 'misc' into release

Sat, 07 Apr 2012 03:48:59 +0200

Merge branches 'idle-fix' and 'misc' into release List of files: /linux/Documentation/ABI/testing/sysfs-devices

959d851caa48829eb85cb85aa949fd6b4c5d5bc6 - Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged

Sun, 01 Apr 2012 21:30:01 +0200

Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-mergedcgroup/for-3.5 contains the following changes which blk-cgroup needsto proceed with the on-going cleanup.* Dynamic addition and removal of cftypes to make config/stat file handling modular for policies.* cgroup removal update to not wait for css references to drain to fix blkcg removal hang caused by cfq caching cfqgs.Pull in cgroup/for-3.5 into block/for-3.5/core. This causes thefollowing conflicts in block/blk-cgroup.c.* 761b3ef50e "cgroup: remove cgroup_subsys argument from callbacks" conflicts with blkiocg_pre_destroy() addition and blkiocg_attach() removal. Resolved by removing @subsys from all subsys methods.* 676f7c8f84 "cgroup: relocate cftype and cgroup_subsys definitions in controllers" conflicts with ->pre_destroy() and ->attach() updates and removal of modular config. Resolved by dropping forward declarations of the methods and applying updates to the relocated blkio_subsys.* 4baf6e3325 "cgroup: convert all non-memcg controllers to the new cftype interface" builds upon the previous item. Resolved by adding ->base_cftypes to the relocated blkio_subsys.Signed-off-by: Tejun Heo List of files: /linux/Documentation/ABI/testing/sysfs-devices

6a4770e335bd4df0a4577146f76e116ab6e23f40 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

Fri, 30 Mar 2012 12:10:03 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next List of files: /linux/Documentation/ABI/testing/sysfs-devices

18af30e259c25a64ad69bb749c661564bc886275 - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest

Wed, 28 Mar 2012 06:53:10 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest List of files: /linux/Documentation/ABI/testing/sysfs-devices

50953e0640b3473dcb409d5d0d938c2742c93b0d - Merge branch 'poll' into staging/for_v3.4

Tue, 27 Mar 2012 16:32:29 +0200

Merge branch 'poll' into staging/for_v3.4* poll: (5970 commits) poll: add poll_requested_events() and poll_does_not_wait() functions crc32: select an algorithm via Kconfig crc32: add self-test code for crc32c crypto: crc32c should use library implementation crc32: bolt on crc32c crc32: add note about this patchset to crc32.c crc32: optimize loop counter for x86 crc32: add slice-by-8 algorithm to existing code crc32: make CRC_*_BITS definition correspond to actual bit counts crc32: fix mixing of endian-specific types crc32: miscellaneous cleanups crc32: simplify unit test code crc32: move long comment about crc32 fundamentals to Documentation/ crc32: remove two instances of trailing whitespaces checkpatch: check for quoted strings broken across lines checkpatch: whitespace - add/remove blank lines checkpatch: warn on use of yield() checkpatch: add --strict tests for braces, comments and casts checkpatch: add [] to type extensions checkpatch: high precedence operators do not require additional parentheses in #defines ... List of files: /linux/Documentation/ABI/testing/sysfs-devices

7fd52392c56361a40f0c630a82b36b95ca31eac6 - Merge branch 'linus' into perf/urgent

Mon, 26 Mar 2012 17:18:44 +0200

Merge branch 'linus' into perf/urgentMerge reason: we need to fix a non-trivial merge conflict.Signed-off-by: Ingo Molnar List of files: /linux/Documentation/ABI/testing/sysfs-devices

3d04d42312eacc68fbcddea337f7eb34bc035dfb - Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Wed, 21 Mar 2012 08:26:18 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net List of files: /linux/Documentation/ABI/testing/sysfs-devices

4a52246302f01596f0edf7b4a3e6425e23479192 - Merge tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Tue, 20 Mar 2012 19:16:20 +0100

Merge tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-corePull driver core patches for 3.4-rc1 from Greg KH: "Here's the big driver core merge for 3.4-rc1. Lots of various things here, sysfs fixes/tweaks (with the nlink breakage reverted), dynamic debugging updates, w1 drivers, hyperv driver updates, and a variety of other bits and pieces, full information in the shortlog."* tag 'driver-core-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (78 commits) Tools: hv: Support enumeration from all the pools Tools: hv: Fully support the new KVP verbs in the user level daemon Drivers: hv: Support the newly introduced KVP messages in the driver Drivers: hv: Add new message types to enhance KVP regulator: Support driver probe deferral Revert "sysfs: Kill nlink counting." uevent: send events in correct order according to seqnum (v3) driver core: minor comment formatting cleanups driver core: move the deferred probe pointer into the private area drivercore: Add driver probe deferral mechanism DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers w1_bq27000: Only one thread can access the bq27000 at a time. w1_bq27000 - remove w1_bq27000_write w1_bq27000: remove unnecessary NULL test. sysfs: Fix memory leak in sysfs_sd_setsecdata(). intel_idle: Revert change of auto_demotion_disable_flags for Nehalem w1: Fix w1_bq27000 driver-core: documentation: fix up Greg's email address powernow-k6: Really enable auto-loading powernow-k7: Fix CPU family number ... List of files: /linux/Documentation/ABI/testing/sysfs-devices