David Howells
cc53ce53c8
Add a dentry op to allow processes to be held during pathwalk transit ...
Add a dentry op (d_manage) to permit a filesystem to hold a process and make it
sleep when it tries to transit away from one of that filesystem's directories
during a pathwalk. The operation is keyed off a new dentry flag
(DCACHE_MANAGE_TRANSIT).
The filesystem is allowed to be selective about which processes it holds and
which it permits to continue on or prohibits from transiting from each flagged
directory. This will allow autofs to hold up client processes whilst letting
its userspace daemon through to maintain the directory or the stuff behind it
or mounted upon it.
The ->d_manage() dentry operation:
int (*d_manage)(struct path *path, bool mounting_here);
takes a pointer to the directory about to be transited away from and a flag
indicating whether the transit is undertaken by do_add_mount() or
do_move_mount() skipping through a pile of filesystems mounted on a mountpoint.
It should return 0 if successful and to let the process continue on its way;
-EISDIR to prohibit the caller from skipping to overmounted filesystems or
automounting, and to use this directory; or some other error code to return to
the user.
->d_manage() is called with namespace_sem writelocked if mounting_here is true
and no other locks held, so it may sleep. However, if mounting_here is true,
it may not initiate or wait for a mount or unmount upon the parameter
directory, even if the act is actually performed by userspace.
Within fs/namei.c, follow_managed() is extended to check with d_manage() first
on each managed directory, before transiting away from it or attempting to
automount upon it.
follow_down() is renamed follow_down_one() and should only be used where the
filesystem deliberately intends to avoid management steps (e.g. autofs).
A new follow_down() is added that incorporates the loop done by all other
callers of follow_down() (do_add/move_mount(), autofs and NFSD; whilst AFS, NFS
and CIFS do use it, their use is removed by converting them to use
d_automount()). The new follow_down() calls d_manage() as appropriate. It
also takes an extra parameter to indicate if it is being called from mount code
(with namespace_sem writelocked) which it passes to d_manage(). follow_down()
ignores automount points so that it can be used to mount on them.
__follow_mount_rcu() is made to abort rcu-walk mode if it hits a directory with
DCACHE_MANAGE_TRANSIT set on the basis that we're probably going to have to
sleep. It would be possible to enter d_manage() in rcu-walk mode too, and have
that determine whether to abort or not itself. That would allow the autofs
daemon to continue on in rcu-walk mode.
Note that DCACHE_MANAGE_TRANSIT on a directory should be cleared when it isn't
required as every tranist from that directory will cause d_manage() to be
invoked. It can always be set again when necessary.
==========================
WHAT THIS MEANS FOR AUTOFS
==========================
Autofs currently uses the lookup() inode op and the d_revalidate() dentry op to
trigger the automounting of indirect mounts, and both of these can be called
with i_mutex held.
autofs knows that the i_mutex will be held by the caller in lookup(), and so
can drop it before invoking the daemon - but this isn't so for d_revalidate(),
since the lock is only held on _some_ of the code paths that call it. This
means that autofs can't risk dropping i_mutex from its d_revalidate() function
before it calls the daemon.
The bug could manifest itself as, for example, a process that's trying to
validate an automount dentry that gets made to wait because that dentry is
expired and needs cleaning up:
mkdir S ffffffff8014e05a 0 32580 24956
Call Trace:
[<ffffffff885371fd>] :autofs4:autofs4_wait+0x674/0x897
[<ffffffff80127f7d>] avc_has_perm+0x46/0x58
[<ffffffff8009fdcf>] autoremove_wake_function+0x0/0x2e
[<ffffffff88537be6>] :autofs4:autofs4_expire_wait+0x41/0x6b
[<ffffffff88535cfc>] :autofs4:autofs4_revalidate+0x91/0x149
[<ffffffff80036d96>] __lookup_hash+0xa0/0x12f
[<ffffffff80057a2f>] lookup_create+0x46/0x80
[<ffffffff800e6e31>] sys_mkdirat+0x56/0xe4
versus the automount daemon which wants to remove that dentry, but can't
because the normal process is holding the i_mutex lock:
automount D ffffffff8014e05a 0 32581 1 32561
Call Trace:
[<ffffffff80063c3f>] __mutex_lock_slowpath+0x60/0x9b
[<ffffffff8000ccf1>] do_path_lookup+0x2ca/0x2f1
[<ffffffff80063c89>] .text.lock.mutex+0xf/0x14
[<ffffffff800e6d55>] do_rmdir+0x77/0xde
[<ffffffff8005d229>] tracesys+0x71/0xe0
[<ffffffff8005d28d>] tracesys+0xd5/0xe0
which means that the system is deadlocked.
This patch allows autofs to hold up normal processes whilst the daemon goes
ahead and does things to the dentry tree behind the automouter point without
risking a deadlock as almost no locks are held in d_manage() and none in
d_automount().
Signed-off-by: David Howells <dhowells@redhat.com>
Was-Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2011-01-15 20:07:31 -05:00
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
net/ceph: make ceph_msgr_wq non-reentrant
2011-01-12 15:15:14 -08:00
decompressors: remove unused constant from inflate.h
2011-01-13 08:03:25 -08:00
hwmon: Support for Dallas Semiconductor DS620
2011-01-09 09:10:10 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-13 09:58:14 -08:00
lockd: Clean up nlmsvc_lookup_host()
2010-12-16 12:37:26 -05:00
mfd: ab8500-core chip version cut 2.0 support
2011-01-14 12:38:18 +01:00
Merge branch 'sh/sdio' into sh-latest
2011-01-12 14:37:42 +09:00
netfilter: x_tables: dont block BH while reading counters
2011-01-10 20:11:38 +01:00
NFC: Driver for NXP Semiconductors PN544 NFC chip.
2011-01-13 08:03:19 -08:00
power_supply: Add MAX17042 Fuel Gauge Driver
2011-01-14 18:11:59 +03:00
regulator: Add initial per-regulator debugfs support
2011-01-12 14:33:05 +00:00
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2011-01-07 17:08:46 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-26 22:37:05 -08:00
Merge branch 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
2011-01-11 15:11:56 -08:00
include/linux/unaligned/packed_struct.h: use __packed
2011-01-13 08:03:08 -08:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-01-07 13:16:28 -08:00
ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework
2011-01-12 16:11:30 -05:00
agp: kill agp_rebind_memory
2010-11-23 20:14:46 +00:00
atm: correct sysfs 'device' link creation and parent relationships
2010-12-10 15:45:05 -08:00
headers: path.h redux
2011-01-10 08:51:44 -08:00
lib: Improve EWMA efficiency by using bitshifts
2010-12-06 15:58:43 -05:00
netdev: bfin_mac: let boards set vlan masks
2011-01-10 13:31:14 -08:00
binfmt_elf: cleanups
2011-01-13 08:03:12 -08:00
bit_spinlock: add required includes
2011-01-07 17:50:31 +11:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
bootmem: Add alloc_bootmem_align()
2010-12-13 16:11:13 -08:00
security: Define CAP_SYSLOG
2010-11-29 08:35:12 +11:00
fs/char_dev.c: remove unused cdev_index()
2011-01-13 08:03:17 -08:00
cdrom: add ->check_events() support
2010-12-16 17:53:38 +01:00
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
clarify a usage constraint for cnt32_to_63()
2010-12-20 09:07:35 -08:00
thp: use compaction in kswapd for GFP_ATOMIC order > 0
2011-01-13 17:32:46 -08:00
sched: Change wait_for_completion_*_timeout() to return a signed long
2011-01-05 14:15:50 +01:00
tty: add 'active' sysfs attribute to tty0 and console device
2010-12-16 16:15:34 -08:00
Add CPER PCIe error section structure and constants definition
2010-12-13 23:40:45 -05:00
cpuidle: CPUIDLE_FLAG_CHECK_BM is omap3_idle specific
2011-01-12 12:47:34 -05:00
cramfs: hide function prototypes behind __KERNEL__ macro
2011-01-13 08:03:22 -08:00
ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch()
2010-11-30 13:39:55 +00:00
drivers/staging/olpc_dcon: convert to new cs5535 gpio API
2011-01-13 08:03:13 -08:00
Add a dentry op to allow processes to be held during pathwalk transit
2011-01-15 20:07:31 -05:00
dcbnl: adding DCBX feature flags get-set
2010-12-31 10:50:54 -08:00
dccp: Policy-based packet dequeueing infrastructure
2010-12-07 13:47:12 +01:00
headers: path.h redux
2011-01-10 08:51:44 -08:00
dm: per target unplug callback support
2011-01-13 20:00:02 +00:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-01-10 16:10:33 -08:00
dm: use non reentrant workqueues if equivalent
2011-01-13 19:59:58 +00:00
dm log userspace: add version number to comms
2011-01-13 19:59:52 +00:00
dmaengine: provide dummy functions for DMA_ENGINE=n
2011-01-03 01:41:40 -08:00
dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled
2010-11-26 09:57:36 +01:00
dynamic debug: Fix build issue with older gcc
2011-01-07 23:36:59 -05:00
core: Replace __get_cpu_var with __this_cpu_read if not used for an address.
2010-12-17 15:07:19 +01:00
net: Add alloc_netdev_mqs function
2011-01-10 16:05:30 -08:00
ethtool: Report link-down while interface is down
2010-12-10 15:55:23 -08:00
ext3: speed up file creates by optimizing rec_len functions
2011-01-10 19:04:07 +01:00
fs: add hole punching to fallocate
2011-01-12 20:16:43 -05:00
fanotify: split version into version and metadata_len
2010-12-15 13:56:33 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2010-12-22 12:56:10 +09:00
net/fec: add mac field into platform data and consolidate fec_get_mac
2011-01-09 15:42:55 -08:00
filter: constify sk_run_filter()
2010-12-08 10:30:34 -08:00
firewire: use split transaction timeout only for split transactions
2011-01-04 08:48:34 +01:00
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
flex_array: fix flex_array_put_ptr macro to be valid C
2010-11-30 17:28:57 -05:00
Add a dentry op to handle automounting rather than abusing follow_link()
2011-01-15 20:05:03 -05:00
fs: fs_struct use seqlock
2011-01-07 17:50:27 +11:00
fs: dcache remove dcache_lock
2011-01-07 17:50:23 +11:00
fs: dcache remove dcache_lock
2011-01-07 17:50:23 +11:00
tracing/events: Show real number in array fields
2010-11-19 10:18:47 -05:00
fuse: fix ioctl ABI
2010-12-07 20:16:56 +01:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
2011-01-13 14:47:54 +01:00
thp: add numa awareness to hugepage allocations
2011-01-13 17:32:45 -08:00
i2c: Add generic I2C multiplexer using GPIO API
2011-01-10 22:11:23 +01:00
include/gpio.h: remove remaining __must_check-annotiations
2011-01-14 08:06:39 -08:00
Input: add input driver for polled GPIO buttons
2010-12-06 17:15:15 -08:00
hardirq.h: needs sched.h if using BKL
2010-11-18 10:56:29 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2011-01-13 09:58:38 -08:00
highmem: Use this_cpu_xx_return() operations
2010-12-17 15:18:04 +01:00
hrtimer.h: fix kernel-doc warning
2011-01-10 07:38:53 -08:00
thp: add compound_trans_head() helper
2011-01-13 17:32:48 -08:00
i2c: Constify i2c_client where possible
2011-01-10 22:11:23 +01:00
mac80211: Remove unused third address from mesh address extension header.
2010-12-20 14:49:47 -05:00
crypto: af_alg - User-space interface for Crypto API
2010-11-19 17:47:57 +08:00
netfilter: ebtables: make broute table work again
2011-01-11 23:55:51 +01:00
include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel
2011-01-06 11:10:05 -08:00
macvlan: Introduce 'passthru' mode to takeover the underlying device
2010-11-22 08:24:29 -08:00
macvlan: lockless tx path
2010-11-16 10:58:30 -08:00
net: typos in comments in include/linux/igmp.h
2011-01-04 11:29:52 -08:00
__in_dev_get_rtnl() can use rtnl_dereference()
2010-12-06 12:59:05 -08:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-01-06 10:23:33 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-13 09:58:14 -08:00
resources: add arch hook for preventing allocation in reserved areas
2010-12-17 10:01:09 -08:00
IPMI: Add one interface to get more info of low-level IPMI device
2010-12-14 00:21:51 -05:00
IPMI: Add one interface to get more info of low-level IPMI device
2010-12-14 00:21:51 -05:00
ipv6: mcast: RCU conversion
2010-11-24 11:16:42 -08:00
irq: use per_cpu kstat_irqs
2011-01-13 17:32:31 -08:00
ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary
2011-01-10 12:29:43 -05:00
The new jhash implementation
2010-12-09 20:17:07 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
mm: vmscan: reclaim order-0 and use compaction instead of lumpy reclaim
2011-01-13 17:32:33 -08:00
irq: use per_cpu kstat_irqs
2011-01-13 17:32:31 -08:00
thp: madvise(MADV_NOHUGEPAGE)
2011-01-13 17:32:47 -08:00
kmsg_dump: add kmsg_dump() calls to the reboot, halt, poweroff and emergency_restart paths
2011-01-13 08:03:07 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
block: add internal hd part table references
2011-01-07 08:43:37 +01:00
kthread_work: make lockdep happy
2010-12-22 10:27:53 +01:00
KVM: Add PV MSR to enable asynchronous page faults delivery.
2011-01-12 11:23:12 +02:00
KVM: Fix build error on s390 due to missing tlbs_dirty
2011-01-12 11:30:50 +02:00
KVM: Add memory slot versioning and use it to provide fast guest write interface
2011-01-12 11:23:08 +02:00
leds-lp5521: modify the way of setting led device name
2011-01-13 08:03:06 -08:00
leds: leds-lp5523: modify the way of setting led device name
2011-01-13 08:03:05 -08:00
[libata] avoid needlessly passing around ptr to SCSI completion func
2011-01-05 19:43:22 -05:00
kernel: fix hlist_bl again
2011-01-14 13:12:45 +00:00
phylib: Add support for Marvell 88E1149R devices.
2010-11-22 08:34:23 -08:00
ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG
2011-01-10 19:04:08 +01:00
tg3: Move EEE definitions into mdio.h
2010-12-06 11:03:46 -08:00
memcg: fix memory migration of shmem swapcache
2011-01-13 17:32:51 -08:00
thp: remove PG_buddy
2011-01-13 17:32:43 -08:00
mm: migration: cleanup migrate_pages API by matching types for offlining and sync
2011-01-13 17:32:34 -08:00
thp: madvise(MADV_NOHUGEPAGE)
2011-01-13 17:32:47 -08:00
thp: fix anon memory statistics with transparent hugepages
2011-01-13 17:32:46 -08:00
thp: add pmd_huge_pte to mm_struct
2011-01-13 17:32:41 -08:00
thp: mmu_notifier_test_young
2011-01-13 17:32:46 -08:00
thp: transparent hugepage vmstat
2011-01-13 17:32:43 -08:00
Merge commit 'v2.6.37-rc7' into x86/security
2010-12-23 09:48:41 +01:00
fs: scale mntget/mntput
2011-01-07 17:50:33 +11:00
mutexes, sched: Introduce arch_mutex_cpu_relax()
2010-11-26 15:05:34 +01:00
Add a dentry op to allow processes to be held during pathwalk transit
2011-01-15 20:07:31 -05:00
move internal-only parts of ncpfs headers to fs/ncpfs
2011-01-12 20:03:43 -05:00
move internal-only parts of ncpfs headers to fs/ncpfs
2011-01-12 20:03:43 -05:00
fs: avoid inode RCU freeing for pseudo fs
2011-01-07 17:50:26 +11:00
net: Add alloc_netdev_mqs function
2011-01-10 16:05:30 -08:00
netfilter: allow hooks to pass error code back up the stack
2010-11-17 10:54:34 -08:00
netlink: fix gcc -Wconversion compilation warning
2010-12-17 12:03:14 -08:00
NFS: Introduce new-style XDR decoding functions for NFSv2
2010-12-16 12:37:23 -05:00
NFS fix the setting of exchange id flag
2011-01-11 14:17:09 -05:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
NFS: Move cl_delegations to the nfs_server struct
2011-01-06 14:57:46 -05:00
nfs: remove extraneous and problematic calls to nfs_clear_request
2010-12-07 23:02:44 -05:00
NFSv4: Ensure continued open and lockowner name uniqueness
2011-01-06 16:03:13 -05:00
nl80211: Export available antennas
2010-12-20 14:49:47 -05:00
x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR
2010-12-22 22:15:32 +01:00
of/address: use proper endianess in get_flags
2010-12-23 15:57:48 -07:00
of/flattree: forward declare struct device_node in of_fdt.h
2011-01-08 21:42:42 -07:00
thp: remove PG_buddy
2011-01-13 17:32:43 -08:00
Revert update for dirty_ratio for memcg.
2011-01-14 07:52:02 -08:00
mm: remove likely() from mapping_unevictable()
2011-01-13 17:32:36 -08:00
fs: scale mntget/mntput
2011-01-07 17:50:33 +11:00
PCI/ACPI: Request _OSC control once for each root bridge (v3)
2011-01-14 08:55:41 -08:00
PCI: Disable ASPM if BIOS asks us to
2010-12-23 12:53:08 -08:00
PCI/PM: Use pm_wakeup_event() directly for reporting wakeup events
2011-01-14 08:55:43 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-01-14 09:29:05 -08:00
PCI/PCIe: Clear Root PME Status bits early during system resume
2010-12-23 12:54:03 -08:00
percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
2010-12-18 15:54:04 +01:00
perf: Sysfs enumeration
2010-12-16 11:36:43 +01:00
pipe_fs_i.h: fix kernel-doc warning
2011-01-10 07:38:54 -08:00
PM: Prototype the pm_generic_ operations
2010-12-24 15:04:41 +01:00
PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
2010-12-24 15:04:06 +01:00
poll: fix a typo in comment
2010-12-10 15:06:43 +01:00
fs: provide simple rcu-walk generic_check_acl implementation
2011-01-07 17:50:29 +11:00
pps: add kernel consumer support
2011-01-13 08:03:21 -08:00
pps: capture MONOTONIC_RAW timestamps as well
2011-01-13 08:03:21 -08:00
include/linux/printk.h: use tab not spaces for indent
2011-01-13 08:03:10 -08:00
spi/pxa2xx: Add chipselect support for Sodaville
2010-12-02 17:55:12 +01:00
quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
2011-01-10 19:04:05 +01:00
mm: migration: use rcu_dereference_protected when dereferencing the radix tree slot during file page migration
2011-01-13 17:32:48 -08:00
Staging: sep: handle the rar definition stuff in the header
2010-11-29 11:17:22 -08:00
rcu: remove unused __list_for_each_rcu() macro
2010-12-17 12:34:59 -08:00
fs: hlist UP debug fixup
2011-01-14 02:36:43 +00:00
rcu: increase synchronize_sched_expedited() batching
2010-12-17 12:34:08 -08:00
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
2010-11-29 22:01:58 -08:00
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
2010-11-29 22:01:58 -08:00
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
rapidio: add definitions of Component Tag fields
2011-01-13 08:03:18 -08:00
rapidio: use common destid storage for endpoints and switches
2011-01-13 08:03:17 -08:00
rapidio: add new idt sRIO switches
2011-01-13 08:03:18 -08:00
thp: transparent hugepage core
2011-01-13 17:32:42 -08:00
romfs: have romfs_fs.h pull in necessary headers
2011-01-13 08:03:23 -08:00
rtc: Namespace fixup
2010-12-13 22:48:21 +01:00
s3c_adc_battery: Add gpio_inverted field to pdata
2010-12-22 02:39:57 +03:00
thp: khugepaged
2011-01-13 17:32:43 -08:00
Merge branch 'master' into next
2011-01-10 09:46:24 +11:00
kernel: optimise seqlock
2011-01-07 17:50:27 +11:00
pps: unify timestamp gathering
2011-01-13 08:03:19 -08:00
omap: Serial: Define register access modes in LCR
2010-11-30 14:11:49 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
2011-01-13 15:06:28 +09:00
net: Introduce skb_checksum_start_offset()
2010-12-16 14:43:14 -08:00
kernel: kmem_ptr_validate considered harmful
2011-01-07 17:50:16 +11:00
tracing/slab: Move kmalloc tracepoint out of inline code
2010-11-28 21:16:28 +02:00
Fix build failure due to hwirq.h needing smp_lock.h
2010-11-17 14:58:36 -08:00
tcp: Replace time wait bucket msg by counter
2010-12-08 12:16:33 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
sony-laptop: support new hotkeys on the P, Z and EC series
2011-01-10 12:00:22 -05:00
x86: Eliminate bp argument from the stack tracing routines
2010-11-18 14:37:34 +01:00
stmmac: add init/exit callback in plat_stmmacenet_data struct
2010-11-24 11:14:24 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-01-13 20:15:35 -08:00
thp: transparent hugepage core
2011-01-13 17:32:42 -08:00
tracing: Remove useless syscall ftrace_event_call declaration
2010-11-18 14:37:45 +01:00
taskstats: pad taskstats netlink response for aligment issues on ia64
2010-12-22 19:43:34 -08:00
Merge branch 'misc' into release
2011-01-12 05:14:15 -05:00
pps: capture MONOTONIC_RAW timestamps as well
2011-01-13 08:03:21 -08:00
timerqueue: Make timerqueue_getnext() static inline
2010-12-11 12:34:34 +01:00
ntp: add hardpps implementation
2011-01-13 08:03:20 -08:00
tipc: cleanup various cosmetic whitespace issues
2011-01-01 13:57:56 -08:00
tipc: cleanup various cosmetic whitespace issues
2011-01-01 13:57:56 -08:00
toshiba.h: hide a function prototypes behind __KERNEL__ macro
2011-01-13 08:03:08 -08:00
key: add tpm_send command
2010-11-29 08:55:22 +11:00
keys: add new trusted key-type
2010-11-29 08:55:25 +11:00
tracepoint: Add __rcu annotation
2011-01-07 20:57:22 -05:00
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-12-02 12:58:16 -08:00
tty: fix typos/errors in tty_driver.h comments
2010-12-16 13:14:32 -08:00
pps: timestamp is always passed to dcd_change()
2011-01-13 08:03:20 -08:00
Kill off a bunch of warning: ‘inline’ is not at beginning of declaration
2010-11-28 23:08:04 +01:00
Input: introduce device properties
2010-12-20 09:37:33 +01:00
Merge branch 'usb-next' into musb-merge
2010-12-16 10:05:06 -08:00
user_ns: improve the user_ns on-the-slab packaging
2011-01-13 08:03:18 -08:00
vga_switcheroo: fix build with non switcheroo enabled path.
2011-01-06 13:05:04 +10:00
ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
2010-12-11 02:01:35 -05:00
mm: unify module_alloc code for vmalloc
2011-01-13 17:32:34 -08:00
mm: vmstat: use a single setter function and callback for adjusting percpu thresholds
2011-01-13 17:32:31 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Smack: Transmute labels on specified directories
2010-12-07 14:04:02 -08:00
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
2010-12-10 14:43:58 -08:00
decompressors: add XZ decompressor module
2011-01-13 08:03:24 -08:00
cc53ce53c8