Linus Torvalds
b6669737d3
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux ...
Pull nfsd changes from J Bruce Fields:
"Miscellaneous bugfixes, plus:
- An overhaul of the DRC cache by Jeff Layton. The main effect is
just to make it larger. This decreases the chances of intermittent
errors especially in the UDP case. But we'll need to watch for any
reports of performance regressions.
- Containerized nfsd: with some limitations, we now support
per-container nfs-service, thanks to extensive work from Stanislav
Kinsbursky over the last year."
Some notes about conflicts, since there were *two* non-data semantic
conflicts here:
- idr_remove_all() had been added by a memory leak fix, but has since
become deprecated since idr_destroy() does it for us now.
- xs_local_connect() had been added by this branch to make AF_LOCAL
connections be synchronous, but in the meantime Trond had changed the
calling convention in order to avoid a RCU dereference.
There were a couple of more obvious actual source-level conflicts due to
the hlist traversal changes and one just due to code changes next to
each other, but those were trivial.
* 'for-3.9' of git://linux-nfs.org/~bfields/linux: (49 commits)
SUNRPC: make AF_LOCAL connect synchronous
nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum
svcrpc: fix rpc server shutdown races
svcrpc: make svc_age_temp_xprts enqueue under sv_lock
lockd: nlmclnt_reclaim(): avoid stack overflow
nfsd: enable NFSv4 state in containers
nfsd: disable usermode helper client tracker in container
nfsd: use proper net while reading "exports" file
nfsd: containerize NFSd filesystem
nfsd: fix comments on nfsd_cache_lookup
SUNRPC: move cache_detail->cache_request callback call to cache_read()
SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function
SUNRPC: rework cache upcall logic
SUNRPC: introduce cache_detail->cache_request callback
NFS: simplify and clean cache library
NFS: use SUNRPC cache creation and destruction helper for DNS cache
nfsd4: free_stid can be static
nfsd: keep a checksum of the first 256 bytes of request
sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer
sunrpc: fix comment in struct xdr_buf definition
...
2013-02-28 18:02:55 -08:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-02-08 13:16:17 -05: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
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08: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
mfd: twl-core: Move twl_i2c_read/write_u8 to header as inline function
2013-02-14 00:22:52 +01:00
iio:triggers Protect functions in triggers.h from use when not compiled
2013-02-09 15:22:14 +00: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
ARM: gic: add __ASSEMBLY__ guard to C definitions
2013-02-11 18:58:34 +00:00
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
2013-02-28 18:02:55 -08:00
backlight: add new lp8788 backlight driver
2013-02-27 19:10:09 -08: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
netfilter: nfnetlink: add mutex per subsystem
2013-02-05 04:07:35 +01:00
nfsd: Store ex_anon_uid and ex_anon_gid as kuids and kgids
2013-02-13 06:16:08 -08:00
pinctrl: generic: rename input schmitt disable
2013-02-15 09:52:29 +01:00
IOMMU Updates for Linux v3.9
2013-02-26 11:09:17 -08:00
bq2415x_charger: Add support for offline and 100mA mode
2013-02-16 13:34:10 -08:00
sched: move RR_TIMESLICE from sysctl.h to rt.h
2013-02-22 09:20:11 -08:00
Staging tree update for 3.9-rc1
2013-02-21 12:11:44 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-02-08 13:16:17 -05:00
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
2013-02-28 18:02:55 -08:00
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
acpi, memory-hotplug: parse SRAT before memblock is ready
2013-02-23 17:50:14 -08:00
gpiolib-acpi: Add ACPI5 event model support to gpio.
2013-01-29 11:47:06 +01:00
async: keep pending tasks on async_domain and remove async_pending
2013-01-23 09:32:30 -08:00
[libata] replace sata_settings with devslp_timing
2013-01-14 13:29:15 -05: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
fs/exec.c: make bprm_mm_init() static
2013-02-26 02:46:13 -05:00
block: add missing block_bio_complete() tracepoint
2013-01-14 15:00:36 +01:00
Input: bma150 - make some defines public and fix some comments
2013-02-15 18:52:45 -08:00
memory-hotplug: common APIs to support page tables hot-remove
2013-02-23 17:50:12 -08:00
buffer: make touch_buffer() an exported function
2013-01-14 15:00:36 +01:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
cgroup: remove synchronize_rcu() from cgroup_diput()
2013-01-24 12:05:18 -08:00
clk: add common of_clk_init() function
2013-01-24 11:09:28 -08:00
clockevents: Add generic timer broadcast function
2013-01-31 22:15:36 +01:00
clocksource: always define CLOCKSOURCE_OF_DECLARE
2013-01-31 19:57:30 -08: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
burying unused conditionals
2013-02-14 09:21:15 -05: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
compiler{,-gcc4}.h, bug.h: Remove duplicate macros
2013-02-21 17:22:15 -08:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
sched: add wait_for_completion_io[_timeout]
2013-02-15 16:45:06 +01:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
context_tracking: Export context state for generic vtime
2013-01-26 17:37:17 +01: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
vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
2013-02-26 02:46:09 -05:00
lockdep: check that no locks held at freeze time
2013-02-27 19:10:11 -08:00
debugfs: regset32: make struct debugfs_reg32 pointer const
2013-01-18 15:25:53 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
Merge branch 'master' into for-next
2013-01-29 10:48:30 +01:00
dmaengine.h: remove redundant else keyword
2013-02-14 20:00:53 +05:30
dynamic_debug: dynamic hex dump
2013-01-17 12:19:09 -08:00
A few fixes to reduce places where pstore might hang
2013-02-21 09:38:18 -08: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
fbmon: add of_videomode helpers
2013-01-24 09:04:04 +01:00
memory-hotplug: remove /sys/firmware/memmap/X sysfs
2013-02-23 17:50:12 -08:00
lockdep: check that no locks held at freeze time
2013-02-27 19:10:11 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
ftrace: Move ARCH_SUPPORTS_FTRACE_SAVE_REGS in Kconfig
2013-01-21 13:22:35 -05:00
tracing: Make a snapshot feature available from userspace
2013-01-30 11:02:06 -05:00
block: fix part_pack_uuid() build error
2013-02-26 03:10:52 +11:00
gpio: devm_gpio_* support should not depend on GPIOLIB
2013-01-22 10:23:35 +01:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-19 18:19:48 -08: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
Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus
2013-02-21 10:45:01 +01:00
mm: remove unused memclear_highpage_flush()
2013-02-23 17:50:16 -08:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
hwmon: Retire SENSORS_LIMIT
2013-01-25 21:03:54 -08:00
Drivers: hv: vmbus: Consolidate all offer GUID definitions in hyperv.h
2013-01-25 11:17:31 -08:00
idr: implement lookup hint
2013-02-27 19:10:21 -08: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
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
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
ipmi: remove superfluous kernel/userspace explanation
2013-02-27 19:10:21 -08: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
Merge branch 'nohz/printk-v8' into irq/core
2013-02-05 00:48:46 +01:00
jbd2: use module parameters instead of debugfs for jbd_debug
2013-02-09 16:29:20 -05:00
taint: add explicit flag to show whether lock dep is still OK.
2013-01-21 17:17:57 +10:30
cputime: Generic on-demand virtual cputime accounting
2013-01-27 19:23:27 +01:00
x86: Add Crash kernel low reservation
2013-01-29 19:32:58 -08:00
kgdb: remove #include <linux/serial_8250.h> from kgdb.h
2013-02-04 15:35:26 -08:00
kprobes/x86: Move ftrace-based kprobe code into kprobes-ftrace.c
2013-01-21 13:22:36 -05:00
ksm: remove old stable nodes more thoroughly
2013-02-23 17:50:19 -08:00
Merge tag 'kvm-3.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-02-24 13:07:18 -08:00
leds: leds-pwm: Convert to use devm_get_pwm
2013-02-01 17:47:04 -08:00
Revert "libata: export host controller number thru /sys"
2013-01-25 15:30:23 -05:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08: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
ARM / highbank: add support for pl320 IPC
2013-02-02 00:01:15 +01:00
mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to protect movablecore_map in memblock_overlaps_region().
2013-02-23 17:50:14 -08:00
mm: refactor inactive_file_is_low() to use get_lru_size()
2013-02-23 17:50:20 -08:00
memory-hotplug: export the function try_offline_node()
2013-02-23 17:50: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
mm,ksm: FOLL_MIGRATION do migration_entry_wait
2013-02-23 17:50:23 -08:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
mm: introduce VM_POPULATE flag to better deal with racy userspace programs
2013-02-23 17:50:11 -08:00
mm: fix wrong comments about anon_vma lock
2013-02-05 20:38:48 +11:00
mmzone: add pgdat_{end_pfn,is_empty}() helpers & consolidate.
2013-02-23 17:50:20 -08:00
mod/file2alias: make modalias generation safe for cross compiling
2013-01-24 22:48:04 +01:00
module: constify within_module_*
2013-01-21 17:18:20 +10:30
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
v4 GRE: Add TCP segmentation offload for GRE
2013-02-15 15:17:11 -05:00
net: fix a build failure when !CONFIG_PROC_FS
2013-02-19 13:18:13 -05: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: Convert idmap to use kuids and kgids
2013-02-13 06:15:29 -08:00
nfs: Convert struct nfs_fattr to Use kuid_t and kgid_t
2013-02-13 06:15:28 -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
gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
2013-02-13 10:11:53 +00: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
mm: only enforce stable page writes if the backing device requires it
2013-02-21 17:22:19 -08:00
PCI changes for the v3.9 merge window:
2013-02-25 21:18:18 -08:00
tty/serial patches for 3.9-rc1
2013-02-21 13:41:04 -08:00
percpu_counter.h: comment code for better readability
2013-02-05 11:54:06 +01:00
perf: Introduce hw_perf_event->tp_target and ->tp_list
2013-02-08 18:28:02 +01: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
driver core: add helper macro for platform_driver_probe() boilerplate
2013-01-17 17:39:33 -08:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
pm2301: LPN mode control support
2013-01-23 14:39:19 +00:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
pps: Add pps_lookup_dev() function
2013-02-13 09:40:35 -08:00
Merge branch 'akpm' (incoming from Andrew)
2013-02-21 17:38:49 -08:00
tty/serial patches for 3.9-rc1
2013-02-21 13:41:04 -08:00
profiling: Remove unused timer hook
2013-01-24 15:37:26 +01:00
ia64: kill thread_matches(), unexport ptrace_check_attach()
2013-01-20 12:26:05 -08: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
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
Merge branches 'doctorture.2013.01.29a', 'fixes.2013.01.26a', 'tagcb.2013.01.24a' and 'tiny.2013.01.29b' into HEAD
2013-01-28 22:25:21 -08:00
Merge remote-tracking branch 'regmap/topic/no-bus' into regmap-next
2013-02-14 17:11:09 +00:00
ring-buffer: Add stats field for amount read from trace ring buffer
2013-01-30 11:01:53 -05:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08: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
coredump: remove redundant defines for dumpable states
2013-02-27 19:10:11 -08:00
tun: fix LSM/SELinux labeling of tun/tap devices
2013-01-14 18:16:59 -05: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
new helper: signal_setup_done()
2013-02-03 15:09:26 -05:00
v4 GRE: Add TCP segmentation offload for GRE
2013-02-15 15:17:11 -05:00
smp: make smp_call_function_many() use logic similar to smp_call_function_single()
2013-02-21 17:22:20 -08:00
smpboot: Allow selfparking per cpu threads
2013-02-14 15:29:37 +01:00
VSOCK: Introduce VM Sockets
2013-02-10 19:41:08 -05:00
srcu: Remove checks preventing idle CPUs from calling srcu_read_lock()
2013-02-07 15:15:00 -08:00
pps: Fix build breakage from decoupling pps from tty
2013-02-13 12:15:50 -08:00
PM: Introduce suspend state PM_SUSPEND_FREEZE
2013-02-09 22:30:44 +01:00
vmscan: change type of vm_total_pages to unsigned long
2013-02-23 17:50:22 -08:00
x86: Don't panic if can not alloc buffer for swiotlb
2013-01-29 19:36:53 -08:00
burying unused conditionals
2013-02-14 09:21:15 -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
Merge branch 'nohz/printk-v8' into irq/core
2013-02-05 00:48:46 +01:00
arm-soc: cleanups
2013-02-21 14:58:40 -08:00
cputime: Use accessors to read task cputime stats
2013-01-27 19:23:31 +01:00
tty: Added a CONFIG_TTY option to allow removal of TTY
2013-01-18 16:15:27 -08: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
pps: Move timestamp read into PPS code proper
2013-02-13 10:13:58 -08:00
uprobes: Introduce uprobe_apply()
2013-02-08 18:28:04 +01:00
USB: add usb_hcd_{start,end}_port_resume
2013-01-25 15:06:01 -08:00
userns: Avoid recursion in put_user_ns
2013-01-26 22:11:41 -08:00
mfd: vexpress: Add pseudo-GPIO based LEDs
2013-02-14 00:22:58 +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
mm: numa: handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING
2013-02-23 17:50:16 -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
wanrouter: delete now orphaned header content, files/drivers
2013-01-31 19:56:35 -05:00
wlcore: move wl12xx_platform_data up and make it truly optional
2013-02-08 10:05:02 +02:00
workqueue: rename cpu_workqueue to pool_workqueue
2013-02-13 19:29:12 -08:00
vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them
2013-01-12 10:47:43 +08:00
