Josef Bacik
18e9e5104f
Introduce freeze_super and thaw_super for the fsfreeze ioctl ...
Currently the way we do freezing is by passing sb>s_bdev to freeze_bdev and then
letting it do all the work. But freezing is more of an fs thing, and doesn't
really have much to do with the bdev at all, all the work gets done with the
super. In btrfs we do not populate s_bdev, since we can have multiple bdev's
for one fs and setting s_bdev makes removing devices from a pool kind of tricky.
This means that freezing a btrfs filesystem fails, which causes us to corrupt
with things like tux-on-ice which use the fsfreeze mechanism. So instead of
populating sb->s_bdev with a random bdev in our pool, I've broken the actual fs
freezing stuff into freeze_super and thaw_super. These just take the
super_block that we're freezing and does the appropriate work. It's basically
just copy and pasted from freeze_bdev. I've then converted freeze_bdev over to
use the new super helpers. I've tested this with ext4 and btrfs and verified
everything continues to work the same as before.
The only new gotcha is multiple calls to the fsfreeze ioctl will return EBUSY if
the fs is already frozen. I thought this was a better solution than adding a
freeze counter to the super_block, but if everybody hates this idea I'm open to
suggestions. Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2010-05-21 18:31:18 -04:00
Merge branch 'devel-stable' into devel
2010-05-17 17:24:04 +01:00
caif: Rewritten socket implementation
2010-04-28 12:55:14 -07:00
can: sja1000 platform data fixes
2010-05-17 22:39:48 -07:00
decompress: fix new decompressor for PIC
2010-03-12 15:52:44 -08:00
Revert "V4L/DVB: Add FE_CAN_PSK_8 to allow apps to identify PSK_8 capable DVB devices"
2010-05-19 12:57:48 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-05-20 09:41:44 -07:00
Input: add Analog Devices AD714x captouch input driver
2010-04-13 23:27:16 -07:00
CAPI: Rework locking of controller data structures
2010-02-16 16:01:22 -08:00
mfd: Add WM8994 interrupt controller support
2010-04-05 19:18:07 +01:00
IB/mlx4: Add support for masked atomic operations
2010-04-21 16:37:49 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2010-04-15 16:21:34 -04:00
mtd: nand: support alternate BB marker locations on MLC
2010-05-14 01:56:12 +01:00
netfilter: xtables: change hotdrop pointer to direct modification
2010-05-11 18:35:27 +02:00
netfilter: xtables: replace XT_ENTRY_ITERATE macro
2010-02-24 18:32:59 +01:00
netfilter: xtables: replace XT_MATCH_ITERATE macro
2010-02-24 18:34:48 +01:00
netfilter: remove stale declaration for ip6_masked_addrcmp()
2010-03-08 13:17:01 +01:00
nfsd: further comment typos
2010-05-03 08:33:00 -04:00
regulator: Let drivers know when they use the stub API
2010-04-19 13:17:10 +01:00
Merge branch 'master' into for-davem
2010-04-23 14:43:45 -04:00
ssb: Fix order of definitions and some text space indents
2010-04-26 13:51:09 -04:00
SUNRPC: Don't spam gssd with upcall requests when the kerberos key expired
2010-05-14 15:09:37 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2010-05-20 21:26:12 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sysctl extern cleanup: acct
2010-03-12 15:53:10 -08:00
x86, acpi/irq: Teach acpi_get_override_irq to take a gsi not an isa_irq
2010-05-04 13:34:27 -07:00
ahci: Add platform driver
2010-05-14 17:08:01 -04:00
serial: Add driver for the Altera JTAG UART
2010-05-21 09:34:30 -07:00
serial: Add driver for the Altera UART
2010-05-21 09:34:30 -07:00
libata-sff: prd is BMDMA specific
2010-05-19 13:38:54 -04:00
Catch filesystems lacking s_bdi
2010-04-25 08:54:42 +02:00
backlight: Allow properties to be passed at registration
2010-03-16 19:47:54 +00:00
coredump: pass mm->flags as a coredump parameter for consistency
2010-03-06 11:26:46 -08:00
Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 09:17:01 -07:00
block: remove 16 bytes of padding from struct request on 64bits
2010-03-19 08:58:16 +01:00
percpu: add __percpu sparse annotations to core kernel subsystems
2010-02-17 11:17:38 +09:00
tg3: Push phylib definitions to phylib
2010-02-17 17:27:40 -08:00
cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h
2010-02-22 13:44:45 +01:00
cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h
2010-02-22 13:44:45 +01:00
cgroup: Check task_lock in task_subsys_state()
2010-05-04 09:25:02 -07:00
Document Linux's circular buffering capabilities
2010-03-24 16:31:22 -07:00
clockevents: Sanitize min_delta_ns adjustment and prevent overflows
2010-03-12 19:10:29 +01:00
clocksource: Add clocksource_register_hz/khz interface
2010-05-10 14:24:26 +02:00
coda: move backing-dev.h kernel include inside __KERNEL__
2010-04-28 09:20:33 +02:00
Add generic sys_old_select()
2010-03-12 15:52:32 -08:00
coredump: plug a memory leak situation on dump_seek()
2010-03-12 15:52:32 -08:00
cpufreq: Unify sysfs attribute definition macros
2010-04-09 14:07:56 -07:00
cpumask: let num_*_cpus() function always return unsigned values
2010-03-06 11:26:29 -08:00
sched: Make select_fallback_rq() cpuset friendly
2010-04-02 20:12:03 +02:00
rcu: Use wrapper function instead of exporting tasklist_lock
2010-03-04 11:46:14 +01:00
Fix the regression created by "set S_DEAD on unlink()..." commit
2010-05-15 07:16:33 -04:00
remove DCB_PROTO_VERSION as we don't do netlink versioning
2010-04-22 18:32:12 -07:00
Debugobjects transition check
2010-05-10 16:08:01 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
dm table: remove unused dm_get_device range parameters
2010-03-06 02:32:27 +00:00
kobj: Add basic infrastructure for dealing with namespaces.
2010-05-21 09:37:31 -07:00
dm: eliminate some holes data structures
2010-03-06 02:32:33 +00:00
dm ioctl: introduce flag indicating uevent was generated
2010-03-06 02:32:31 +00:00
dma-mapping: dma-mapping.h: add dma_set_coherent_mask
2010-03-12 15:52:42 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2010-03-04 08:20:14 -08:00
quota: unify ->set_dqblk
2010-05-21 19:30:44 +02:00
drbd: --dry-run option for drbdsetup net ( drbdadm -- --dry-run connect <res> )
2010-03-11 15:51:23 +01:00
drbd: Renamed overwrite_peer to primary_force
2010-03-11 16:32:14 +01:00
early_res: Add free_early_partial()
2010-02-26 08:25:35 +01:00
[S390] add breaking event address for user space
2010-05-17 10:00:15 +02:00
elf coredump: add extended numbering support
2010-03-06 11:26:46 -08:00
net: fix ethtool coding style errors and warnings
2010-04-07 21:54:42 -07:00
commit_metadata export operation replacing nfsd_sync_dir
2010-02-20 13:13:44 -08:00
ext2: Add ext2_sb_info s_lock spinlock
2010-05-21 19:30:39 +02:00
ext3: fix broken handling of EXT3_STATE_NEW
2010-03-29 14:30:19 -07:00
ext3: fix broken handling of EXT3_STATE_NEW
2010-03-29 14:30:19 -07:00
failslab: add ability to filter slab caches
2010-02-26 19:19:39 +02:00
vga16fb, drm: vga16fb->drm handoff
2010-05-18 16:19:30 +10:00
vfs: Abstract rcu_dereference_check for files-fdtable use
2010-02-25 10:34:49 +01:00
net: rtnetlink: decouple rtnetlink address families from real address families
2010-04-26 16:13:54 +02:00
net: Socket filter ancilliary data access for skb->dev->type
2010-04-22 16:05:44 -07:00
firewire: cdev: fix cut+paste mistake in disclaimer
2010-04-15 22:18:36 +02:00
firewire: cdev: fix cut+paste mistake in disclaimer
2010-04-15 22:18:36 +02:00
memory-hotplug: create /sys/firmware/memmap entry for new memory
2010-03-06 11:26:25 -08:00
firmware_class: fix memory leak - free allocated pages
2010-05-21 09:37:28 -07:00
Freezer: Fix buggy resume test for tasks frozen with cgroup freezer
2010-03-26 23:51:44 +01:00
Introduce freeze_super and thaw_super for the fsfreeze ioctl
2010-05-21 18:31:18 -04:00
SLOW_WORK: CONFIG_SLOW_WORK_PROC should be CONFIG_SLOW_WORK_DEBUG
2010-03-29 09:14:47 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:35:04 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-05-21 07:19:18 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
netlink: Export genl_lock() API for use by modules
2010-04-03 14:56:05 -07:00
Remove GENHD_FL_DRIVERFS
2010-03-16 08:55:32 +01:00
mm: add comment about deprecation of __GFP_NOFAIL
2010-03-06 11:26:27 -08:00
GFS2: Remove old, unused linked list code from quota
2010-03-01 14:08:10 +00:00
tty: n_gsm line discipline
2010-05-21 09:34:29 -07:00
Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend' into for-linus
2010-05-19 14:05:06 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt
2010-02-26 17:05:10 -08:00
hrtimers: Provide schedule_hrtimeout for CLOCK_REALTIME
2010-04-06 21:50:03 +02:00
mfd: Add HTCPLD driver
2010-03-07 22:17:09 +01:00
hw-breakpoints: Get the number of available registers on boot dynamically
2010-05-01 04:32:14 +02:00
i2c-algo-bit: Add pre- and post-xfer hooks
2010-03-13 20:56:56 +01:00
i2c-omap: add mpu wake up latency constraint in i2c
2010-05-20 00:18:59 +01:00
i2c: Add SMBus alert support
2010-03-02 12:23:42 +01:00
Add the platform data include for the Xilinx XPS IIC Bus Interface
2010-03-14 11:14:58 -07:00
i2c-core: Use per-adapter userspace device lists
2010-05-04 11:09:28 +02:00
i2o: Remove the dangerous kobj_to_i2o_device macro
2010-03-24 08:20:03 +01:00
ipv6: drop unused "dev" arg of icmpv6_send()
2010-02-18 14:30:17 -08:00
ide: Requeue request after DMA timeout
2010-04-01 01:31:13 -07:00
mac80211: add flags for STBC (Space-Time Block Coding)
2010-04-20 11:52:21 -04:00
netpoll: add generic support for bridge and bonding devices
2010-05-06 00:47:21 -07:00
net-caif: add CAIF protocol definitions
2010-03-30 19:08:43 -07:00
net-caif: add CAIF protocol definitions
2010-03-30 19:08:43 -07:00
net: Add netlink support for virtual port management (was iovnl)
2010-05-17 22:49:55 -07:00
net: adjust handle_macvlan to pass port struct to hook
2010-05-15 23:48:02 -07:00
packet: support for TX time stamps on RAW sockets
2010-04-13 01:30:48 -07:00
l2tp: Update PPP-over-L2TP driver to work over L2TPv3
2010-04-03 14:56:04 -07:00
l2tp: Update PPP-over-L2TP driver to work over L2TPv3
2010-04-03 14:56:04 -07:00
tun: add ioctl to modify vnet header size
2010-05-03 12:33:13 +03:00
if_tunnel.h: add missing ams/byteorder.h include
2010-03-21 21:19:02 -07:00
X25: Add if_x25.h and x25 to device identifiers
2010-04-22 16:12:36 -07:00
IPv6: data structure changes for new socket options
2010-04-23 23:35:28 -07:00
net ipv4: Decouple ipv4 interface parameters from binary sysctl numbers
2010-02-16 15:55:17 -08:00
rcu: remove all rcu head initializations, except on_stack initializations
2010-05-11 16:10:47 -07:00
Input: add Analog Devices AD714x captouch input driver
2010-04-13 23:27:16 -07:00
interrupt.h: fix fatal kernel-doc error
2010-05-21 10:48:12 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
cgroups: blkio subsystem as module
2010-03-12 15:52:36 -08:00
iommu-api: Remove iommu_{un}map_range functions
2010-03-07 18:01:13 +01:00
resources: add interfaces that return conflict information
2010-03-23 13:33:50 -07:00
nsproxy: remove INIT_NSPROXY()
2010-03-12 15:52:40 -08:00
ipmi: remove ipmi_smi.h self-include
2010-03-12 15:52:40 -08:00
ipv6: ip6mr: support multiple tables
2010-05-11 14:40:55 +02:00
genirq: Add CPU mask affinity hint
2010-05-03 11:50:57 +02:00
ibft, x86: Change reserve_ibft_region() to find_ibft_region()
2010-04-01 16:12:48 -07:00
jbd: Provide function to check whether transaction will issue data barrier
2010-05-21 19:30:40 +02:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
JFFS2: avoid using C++ keyword `new' in userspace-visible header
2010-02-25 12:51:41 +00:00
X25: Add if_x25.h and x25 to device identifiers
2010-04-22 16:12:36 -07:00
printk,kdb: capture printk() when in kdb shell
2010-05-20 21:04:27 -05:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2010-05-18 23:01:55 -07:00
CAPI: Rework controller state notifier
2010-02-16 16:01:21 -08:00
percpu: add __percpu sparse annotations to core kernel subsystems
2010-02-17 11:17:38 +09:00
Merge branch 'master' into for-next
2010-04-23 02:08:44 +02:00
x86, kgdb, init: Add early and late debug states
2010-05-20 21:04:29 -05:00
sysctl extern cleanup: module
2010-03-12 15:53:10 -08:00
kobj: add comment and multiple inclusion protection
2010-03-15 15:29:39 +01:00
netns: Teach network device kobjects which namespace they are in.
2010-05-21 09:37:32 -07:00
kprobes: Jump optimization sysctl interface
2010-02-25 17:49:25 +01:00
kref: remove kref_set
2010-05-21 09:37:29 -07:00
ks8842: Add platform data for setting mac address
2010-04-21 16:33:29 -07:00
ktime: introduce ktime_to_ms()
2010-05-14 15:09:32 -04:00
KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
2010-03-01 12:36:14 -03:00
KVM: Increase NR_IOBUS_DEVS limit to 200
2010-04-20 13:08:30 +03:00
l2tp: Add netlink control API for L2TP
2010-04-03 14:56:05 -07:00
block: Fix overrun in lcm() and move it to lib
2010-03-15 12:47:59 +01:00
libata-sff: separate out BMDMA qc_issue
2010-05-19 13:38:55 -04:00
lib: fix first line of kernel-doc for a few functions
2010-03-06 11:26:35 -08:00
lockdep: Add novalidate class for dev->mutex conversion
2010-05-21 09:37:30 -07:00
LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE
2010-04-28 08:51:12 +10:00
switch inotify_user to anon_inode
2010-02-19 03:35:12 -05:00
memcg: fix oom kill behavior
2010-03-12 15:52:38 -08:00
memory hotplug: allow setting of phys_device
2010-03-17 18:43:47 -07:00
V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device
2010-05-18 00:52:36 -03:00
Merge branch 'linus' into perf/core
2010-04-08 13:37:18 +02:00
nommu: fix build breakage
2010-03-12 15:52:28 -08:00
Merge branch 'for-next' into for-linus
2010-03-08 16:55:37 +01:00
take check for new events in namespace (guts of mounts_poll()) to namespace.c
2010-03-03 14:07:59 -05:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2010-05-18 23:01:55 -07:00
Merge branch 'linus' into tracing/core
2010-04-08 10:18:47 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2010-03-04 08:15:33 -08:00
ipv4: ipmr: support multiple tables
2010-04-13 14:49:34 -07:00
ipv6: ip6mr: support multiple tables
2010-05-11 14:40:55 +02:00
ncpfs: add bdi backing to mount session
2010-04-22 12:31:11 +02:00
net: sock_def_readable() and friends RCU conversion
2010-05-01 15:00:15 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-05-20 21:04:44 -07:00
netfilter: restore POST_ROUTING hook in NF_HOOK_COND
2010-02-19 08:03:28 +01:00
netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPPoE traffic
2010-04-20 16:22:01 +02:00
netfilter: ip6table_raw: fix table priority
2010-03-25 11:17:26 +01:00
netlink: Implment netlink_broadcast_filtered
2010-05-21 09:37:32 -07:00
netpoll: Use 'bool' for netpoll_rx() return type.
2010-05-06 01:31:27 -07:00
NFS: Add helper functions for allocating filehandles and fattr structs
2010-05-14 15:09:21 -04:00
NFSv4: Clean up the NFSv4 setclientid operation
2010-05-14 15:09:30 -04:00
NFSv4: Clean up the NFSv4 setclientid operation
2010-05-14 15:09:30 -04:00
nilfs2: enlarge s_volume_name member in nilfs_super_block
2010-05-10 11:32:33 +09:00
cfg80211/mac80211: better channel handling
2010-05-07 14:55:50 -04:00
nodemask: fix the declaration of NODEMASK_ALLOC()
2010-03-12 15:52:38 -08:00
netpoll: add generic support for bridge and bonding devices
2010-05-06 00:47:21 -07:00
of: Fix comparison of "compatible" properties
2010-03-18 07:30:31 -06:00
memcg: fix race in file_mapped accounting
2010-04-07 08:38:05 -07:00
PCI / ACPI / PM: Platform support for PCI PME wake-up
2010-02-22 16:21:02 -08:00
dma-mapping.h: add the dma_unmap state API
2010-03-12 15:52:42 -08:00
dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h
2010-03-12 15:52:42 -08:00
PCI: Make current and maximum bus speeds part of the PCI core
2010-02-22 16:15:17 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-03-03 08:47:22 -08:00
igb: add support for reporting 5GT/s during probe on PCIe Gen2
2010-04-27 12:53:28 -07:00
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
2010-04-05 09:39:11 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2010-03-03 07:34:18 -08:00
Revert "perf: Fix exit() vs PERF_FORMAT_GROUP"
2010-05-11 08:31:49 +02:00
phylib: Support phy module autoloading
2010-04-02 14:30:39 -07:00
pktcdvd: use BIO list management functions
2010-02-24 08:30:08 +01:00
platform: Make platform resource input parameters const
2010-05-17 21:37:40 +02:00
PM: Provide generic subsystem-level callbacks
2010-03-06 21:28:37 +01:00
PM QOS update
2010-05-10 23:08:19 +02:00
i2c: Fix bus-level power management callbacks
2010-05-10 23:09:30 +02:00
PM: pm_wakeup - switch to using bool
2010-05-10 23:08:15 +02:00
hugetlb: fix infinite loop in get_futex_key() when backed by huge pages
2010-04-24 11:31:25 -07:00
sysctl extern cleanup: poll
2010-03-12 15:53:11 -08:00
ppp: Add ppp_dev_name() exported function
2010-04-03 14:56:02 -07:00
x86, perf, bts, mm: Delete the never used BTS-ptrace code
2010-03-26 11:33:55 +01:00
quota: unify ->set_dqblk
2010-05-21 19:30:44 +02:00
quota: Refactor dquot_transfer code so that OCFS2 can pass in its references
2010-05-21 19:30:45 +02:00
radix_tree_tag_get() is not as safe as the docs make out [ver #2 ]
2010-04-09 10:12:03 -07:00
devtmpfs: support !CONFIG_TMPFS
2010-05-21 09:37:30 -07:00
Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 09:28:04 -07:00
net: rcu fixes
2010-05-03 15:53:54 -07:00
rcu: Disable lockdep checking in RCU list-traversal primitives
2010-02-25 09:41:02 +01:00
rcu head introduce rcu head init on stack
2010-05-10 16:53:55 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:27:54 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:27:54 -07:00
sysctl extern cleanup: C_A_D
2010-03-12 15:52:44 -08:00
pass writeback_control to ->write_inode
2010-03-05 13:25:52 -05:00
reiserfs: fix oops while creating privroot with selinux enabled
2010-03-24 16:31:21 -07:00
PM: Asynchronous suspend and resume of devices
2010-02-26 20:39:09 +01:00
rfkill: Add support for KEY_RFKILL
2010-03-02 14:28:49 -05:00
ring-buffer: Make non-consuming read less expensive with lots of cpus.
2010-04-27 13:06:35 -04:00
vmscan: detect mapped file pages used only once
2010-03-06 11:26:27 -08:00
rtc-v3020: make bitfield unsigned
2010-05-11 10:09:47 +02:00
rtc/hctosys: only claim the RTC provided the system time if it did
2010-03-12 15:52:28 -08:00
sysctl extern cleanup: rtmutex
2010-03-12 15:53:10 -08:00
ipv6: ip6mr: support multiple tables
2010-05-11 14:40:55 +02:00
locking: Make sparse work with inline spinlocks and rwlocks
2010-03-13 01:21:21 +01:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:27:54 -07:00
Merge branch 'master' into next
2010-05-06 10:56:07 +10:00
seq_file: add RCU versions of new hlist/list iterators (v3)
2010-02-22 15:45:54 -08:00
Merge branch 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
2010-05-21 11:08:05 -07:00
dmaengine: shdma: Remove sh_dmae_slave_chan_id enum
2010-03-23 17:19:30 +09:00
Input: add driver for hampshire serial touchscreens
2010-04-13 23:27:41 -07:00
sh: fixup the docbook paths for clock framework shuffling.
2010-05-13 18:42:25 +09:00
SH: constify multiple DMA related objects and references to them
2010-04-26 15:50:50 +09:00
sh: intc: IRQ auto-distribution support.
2010-04-15 13:13:52 +09:00
sysctl extern cleanup: signal
2010-03-12 15:52:44 -08:00
net: add a noref bit on skb dst
2010-05-17 17:18:50 -07:00
slab: Generify kernel pointer validation
2010-04-09 10:09:50 -07:00
smbfs: add bdi backing to mount session
2010-04-22 12:37:07 +02:00
smp: fix documentation in include/linux/smp.h
2010-03-06 11:26:32 -08:00
icmp: Account for ICMP out errors
2010-04-03 15:09:04 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-04-06 23:53:30 -07:00
locking: Make sparse work with inline spinlocks and rwlocks
2010-03-13 01:21:21 +01:00
rcu: make SRCU usable in modules
2010-05-10 11:08:35 -07:00
stmmac: new descriptor field for the driver's platform
2010-04-14 04:49:51 -07:00
cpu_stop: add dummy implementation for UP
2010-05-08 17:12:33 +02:00
memcg: move charges of anonymous swap
2010-03-12 15:52:36 -08:00
Fix up prototype for sys_ipc breakage
2010-03-22 13:12:33 -07:00
sysctl: add proc_do_large_bitmap
2010-05-15 23:28:39 -07:00
sysdev: Add sysdev_create/remove_files
2010-03-07 17:04:47 -08:00
sysfs: add struct file* to bin_attr callbacks
2010-05-21 09:37:31 -07:00
Input: implement SysRq as a separate input handler
2010-04-13 23:26:02 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Input: add keypad driver for keys interfaced to TCA6416
2010-05-03 23:50:42 -07:00
net: TCP thin dupack
2010-02-18 15:43:09 -08:00
sched: Intoduce get_cpu_iowait_time_us()
2010-05-09 19:35:27 +02:00
time: Remove xtime_cache
2010-04-13 12:43:42 +02:00
timers: Introduce the concept of timer slack for legacy timers
2010-04-06 21:50:02 +02:00
ntp: Remove tickadj
2010-03-23 17:19:38 +01:00
tipc: Update commenting in TIPC API
2010-05-12 23:02:23 -07:00
tipc: Add support for "-s" configuration option
2010-05-12 23:02:23 -07:00
tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header
2010-05-05 11:46:17 -04:00
tty: n_gsm line discipline
2010-05-21 09:34:29 -07:00
USB: tty: Add a function to insert a string of characters with the same flag
2010-03-02 14:55:11 -08:00
ldisc: new dcd_change() method for line disciplines
2010-03-12 15:52:43 -08:00
atomic_t: Remove volatile from atomic_t definition
2010-05-17 07:57:27 -07:00
USB: remove unused usb_buffer_alloc and usb_buffer_free macros
2010-05-20 13:21:50 -07:00
vga_switcheroo: fix build on platforms with no ACPI
2010-03-01 22:21:58 +11:00
viafb: move some include files to include/linux
2010-05-11 16:07:59 -06:00
viafb: move some include files to include/linux
2010-05-11 16:07:59 -06:00
viafb: move some include files to include/linux
2010-05-11 16:07:59 -06:00
V4L/DVB: Add a new ERROR flag for DQBUF after recoverable streaming errors
2010-05-19 12:58:37 -03:00
net/9p: Add sysfs mount_tag file for virtio 9P device
2010-03-13 08:57:29 -06:00
net/9p: Use the tag name in the config space for identifying mount point
2010-03-13 08:57:28 -06:00
virtio: Add memory statistics reporting to the balloon driver (V4)
2010-02-24 14:22:08 +10:30
virtio_blk: add block topology support
2010-02-24 14:22:26 +10:30
virtio: disable multiport console support.
2010-04-08 09:46:19 +09:30
Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call"
2010-03-19 07:17:52 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2010-05-20 21:26:12 -07:00
wireless.h: Use SIOCIWFIRST not SIOCSIWCOMMIT for range check
2010-03-23 16:50:26 -04:00
vfs: improve writeback_inodes_wb()
2010-03-12 10:03:42 +01:00
xfrm: introduce basic mark infrastructure
2010-02-22 16:19:45 -08:00
m68k: amiga - Zorro host bridge platform device conversion
2010-05-17 21:37:42 +02:00
18e9e5104f