Linus Torvalds
51a26ae7a1
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Just a small pile of fixes"
1) Fix race conditions in IP fragmentation LRU list handling, from
Konstantin Khlebnikov.
2) vfree() is no longer verboten in interrupts, so deferring is
pointless, from Al Viro.
3) Conversion from mutex to semaphore in netpoll left trylock test
inverted, caught by Dan Carpenter.
4) 3c59x uses wrong base address when releasing regions, from Sergei
Shtylyov.
5) Bounds checking in TIPC from Dan Carpenter.
6) Fastopen cookies should not be expired as aggressively as other TCP
metrics. From Eric Dumazet.
7) Fix retrieval of MAC address in ibmveth, from Ben Herrenschmidt.
8) Don't use "u16" in virtio user headers, from Stephen Hemminger
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
tipc: potential divide by zero in tipc_link_recv_fragment()
tipc: add a bounds check in link_recv_changeover_msg()
net/usb: new driver for RTL8152
3c59x: fix freeing nonexistent resource on driver unload
netpoll: inverted down_trylock() test
rps_dev_flow_table_release(): no need to delay vfree()
fib_trie: no need to delay vfree()
net: frag, fix race conditions in LRU list maintenance
tcp: do not expire TCP fastopen cookies
net/eth/ibmveth: Fixup retrieval of MAC address
virtio: don't expose u16 in userspace api
2013-05-06 15:51:10 -07:00
ARM: PL011: Add support for Rx DMA buffer polling.
2013-03-29 09:20:05 -07:00
brcmfmac: setup SDIO reset behavior
2013-04-12 14:27:55 -04:00
libceph: use slab cache for osd client requests
2013-05-02 11:58:41 -05:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
mfd: twl4030-madc: Add support for raw value in twl4030_madc_conversion
2013-04-08 16:36:23 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
Cleanups for Allwinner sunXi architecture:
2013-04-11 03:39:00 -07:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
net/mlx4: Add support to get VF config
2013-04-26 23:29:14 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-05-06 15:41:42 -07:00
mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
2013-03-14 12:48:54 +00:00
netfilter: ipset: set match: add support to match the counters
2013-04-29 20:09:03 +02:00
pinctrl/pinconfig: add debug interface
2013-04-19 15:45:05 +02:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-05-06 15:41:42 -07:00
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
2013-04-16 17:38:10 -07:00
Merge remote-tracking branch 'regulator/topic/max8952' into v3.9-rc8
2013-04-28 02:13:43 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2013-04-23 14:09:39 -04:00
Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10
2013-04-29 16:23:34 -04:00
sound updates for v3.10-rc1
2013-05-03 09:10:23 -07:00
Power management and ACPI updates for 3.10-rc1
2013-04-30 15:21:02 -07:00
gpiolib-acpi: introduce acpi_get_gpio_by_index() helper
2013-04-12 00:31:18 +02:00
libata: Use integer return value for atapi_command_packet_set
2013-04-03 19:33:40 -04:00
gpio: gpio-generic: Add 16 and 32 bit big endian byte order support
2013-04-10 23:41:16 +02:00
new helper: read_code()
2013-04-29 15:40:23 -04:00
mm: make snapshotting pages for stable writes a per-bio operation
2013-04-29 15:54:33 -07:00
Revert "block: add missing block_bio_complete() tracepoint"
2013-04-18 09:00:26 -07:00
mm, nobootmem: clean-up of free_low_memory_core_early()
2013-04-29 15:54:39 -07:00
Mostly performance and bug fixes, plus some cleanups. The one new
2013-05-01 08:04:12 -07:00
Add file_ns_capable() helper function for open-time capability checking
2013-04-14 10:06:31 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
mm: cleancache: clean up cleancache_enabled
2013-04-30 17:04:01 -07:00
clk: add table lookup to mux
2013-03-22 15:18:18 -07:00
clk: composite: rename 'div' references to 'rate'
2013-04-12 11:22:35 -07:00
clk: Properly handle notifier return values
2013-04-10 16:33:53 -07:00
Power management and ACPI updates for 3.10-rc1
2013-04-30 15:21:02 -07:00
ARM: arm-soc cleanup for 3.10
2013-05-02 09:03:55 -07:00
connector: Added coredumping event to the process connector
2013-03-20 13:23:21 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-01 07:21:43 -07:00
gcc4: disable __compiletime_object_size for GCC 4.6+
2013-04-29 18:28:13 -07:00
kprobes: Move __kprobes definition into compiler.h
2013-04-08 17:28:34 +02:00
early_printk: consolidate random copies of identical code
2013-04-29 18:28:13 -07:00
idle: Implement generic idle function
2013-04-08 17:39:23 +02:00
cpufreq: Notify all policy->cpus in cpufreq_notify_transition()
2013-04-02 15:24:00 +02:00
cpuidle: make a single register function for all
2013-04-23 13:45:22 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
lib, net: make isodigit() public and use it
2013-04-29 18:28:19 -07:00
debug_locks.h: make warning more verbose
2013-04-29 15:54:27 -07:00
PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset
2013-04-02 01:28:41 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-05-01 13:20:04 -07:00
dma-buf: Add debugfs support
2013-05-01 16:36:22 +05:30
dump_stack: implement arch-specific hardware description in task dumps
2013-04-30 17:04:02 -07:00
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
efi, pstore: Read data from variable store before memcpy()
2013-04-30 16:03:10 +01:00
Remove spurious _H suffixes from ifdef comments
2013-03-27 13:48:25 +01:00
CONFIG_SYMBOL_PREFIX: cleanup.
2013-03-15 15:09:43 +10:30
fat: restructure export_operations
2013-04-29 18:28:40 -07:00
don't bother with deferred freeing of fdtables
2013-05-01 17:31:42 -04:00
filter: fix va_list build error
2013-05-01 16:28:48 -04:00
Revert "lockdep: check that no locks held at freeze time"
2013-03-31 11:38:33 -07:00
frontswap: get rid of swap_lock dependency
2013-04-30 17:04:00 -07:00
fs: Fix hang with BSD accounting on frozen filesystem
2013-05-04 14:57:58 -04:00
userns: Don't allow creation if the user is chrooted
2013-03-27 07:49:29 -07:00
inotify: convert inotify_add_to_idr() to use idr_alloc_cyclic()
2013-04-29 18:28:41 -07:00
Tracing updates for Linux 3.10
2013-04-29 13:55:38 -07:00
tracing: Compare to 1 instead of zero for is_signed_type()
2013-04-19 17:10:27 -04:00
genalloc: add devres support, allow to find a managed pool by device
2013-04-29 18:28:13 -07:00
ARM: pxa: move PXA_GPIO_TO_IRQ macro
2013-04-11 10:00:05 +08:00
kprobes: Make hash_64() as always inlined
2013-03-18 10:21:23 +01:00
HID: debug: break out hid_dump_report() into hid-debug
2013-04-30 10:09:06 +02:00
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
2013-04-30 10:17:48 +02:00
hrtimer: Add hrtimer support for CLOCK_TAI
2013-03-22 16:19:59 -07:00
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
mm, hugetlb: include hugepages in meminfo
2013-04-29 15:54:35 -07:00
drivers/video: add Hyper-V Synthetic Video Frame Buffer Driver
2013-04-29 15:54:26 -07:00
i2c: Make the return type of i2c_del_mux_adapter() void
2013-04-02 07:07:32 +02:00
i2c: Make return type of i2c_del_adapter() void
2013-04-02 07:06:17 +02:00
ipv6: Kill ipv6 dependency of icmpv6_send().
2013-04-29 13:54:36 -04:00
idr: introduce idr_alloc_cyclic()
2013-04-29 18:28:41 -07:00
mac80211: parse VHT channel switch IEs
2013-04-16 15:29:45 +02:00
firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.
2013-03-26 12:32:13 -04:00
net: vlan: fix dummy function signatures for CONFIG_VLAN=n
2013-04-21 15:56:59 -04:00
Remove spurious _H suffixes from ifdef comments
2013-03-27 13:48:25 +01:00
Remove spurious _H suffixes from ifdef comments
2013-03-27 13:48:25 +01:00
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next
2013-05-02 12:10:19 +02:00
resource: add release_mem_region_adjustable()
2013-04-29 15:54:37 -07:00
ipack: split ipack_device_register() in several functions
2013-03-15 12:23:09 -07:00
ipc: sysv shared memory limited to 8TiB
2013-05-01 08:12:58 -07:00
irq_work.h: fix warning when CONFIG_IRQ_WORK=n
2013-03-22 16:41:19 -07:00
jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
2013-04-25 15:25:23 +02:00
jbd2: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
2013-04-19 17:49:23 -04:00
timekeeping: Make jiffies_lock internal
2013-03-22 16:20:00 -07:00
jbd2: reduce journal_head size
2013-04-12 00:03:42 -04:00
proc: Split kcore bits from linux/procfs.h into linux/kcore.h
2013-04-29 15:42:02 -04:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
x86, kdump: Retore crashkernel= to allocate under 896M
2013-04-17 12:35:33 -07:00
kmod: remove call_usermodehelper_fns()
2013-04-30 17:04:06 -07:00
kprobes: Move __kprobes definition into compiler.h
2013-04-08 17:28:34 +02:00
kthread: implement probe_kthread_data()
2013-04-30 17:04:02 -07:00
net: socket: move ktime2ts to ktime header api
2013-04-19 16:39:13 -04:00
Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-05-05 14:47:31 -07:00
KVM: Allow cross page reads and writes from cached translations.
2013-04-07 13:05:35 +03:00
leds: add camera LED triggers
2013-04-01 11:04:50 -07:00
libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive
2013-04-03 19:33:43 -04:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
list: Fix double fetch of pointer in hlist_entry_safe()
2013-03-14 13:18:30 -07:00
Revert "math64: New div64_u64_rem helper"
2013-04-30 19:13:05 +02:00
mei: bus: Add device enabling and disabling API
2013-04-08 16:57:15 -07:00
memory hotplug: fix warnings
2013-04-30 17:04:00 -07:00
mm, hotplug: avoid compiling memory hotremove functions when disabled
2013-04-29 15:54:37 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-05-01 07:21:43 -07:00
Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs"
2013-03-28 17:45:51 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
mei: bus: Initial MEI Client bus type implementation
2013-03-29 08:35:47 -07:00
CONFIG_SYMBOL_PREFIX: cleanup.
2013-03-15 15:09:43 +10:30
vfs: Add a mount flag to lock read only bind mounts
2013-03-27 07:50:04 -07:00
PCI: Remove "extern" from function declarations
2013-04-23 09:50:30 -06:00
mutex: Queue mutex spinners with MCS lock to reduce cacheline contention
2013-04-19 09:33:36 +02:00
mv643xx_eth: convert to use the Marvell Orion MDIO driver
2013-03-22 10:25:15 -04:00
ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
2013-03-19 11:07:58 +08:00
net: rename random32 to prandom
2013-04-29 18:28:44 -07:00
net: Restore NETIF_F_* bit ordering.
2013-05-02 07:34:58 -07:00
rps_dev_flow_table_release(): no need to delay vfree()
2013-05-06 11:06:51 -04:00
netfilter: remove unneeded variable proc_net_netfilter
2013-04-05 21:08:11 +02:00
netlink: implement memory mapped recvmsg()
2013-04-19 14:57:58 -04:00
netpoll: convert mutex into a semaphore
2013-05-01 15:00:24 -04:00
NFS: Add functionality to allow waiting on all outstanding reads to complete
2013-04-08 22:12:33 -04:00
NFSv4.1: Set the RPC_CLNT_CREATE_INFINITE_SLOTS flag for NFSv4.1 transports
2013-04-14 12:59:28 -04:00
Merge branch 'rpcsec_gss-from_cel' into linux-next
2013-04-23 15:40:40 -04:00
include/linux/memory.h: implement register_hotmemory_notifier()
2013-04-29 15:54:36 -07:00
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
of_net.h: Provide empty functions if OF_NET is not configured
2013-04-02 16:43:09 -04:00
openvswitch: Expose <linux/openvswitch.h> to userspace
2013-03-29 17:54:33 -07:00
vm: adjust ifdef for TINY_RCU
2013-04-29 15:54:28 -07:00
PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
2013-04-12 16:52:01 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-04-30 08:42:45 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
Merge commit ' 8700c95adb' into timers/nohz
2013-05-02 17:54:19 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
get rid of the last free_pipe_info() callers
2013-04-09 14:13:02 -04:00
driver core: platform_device.h: fix checkpatch errors and warnings
2013-03-29 09:14:16 -07:00
Linux 3.9-rc3
2013-03-19 09:47:30 +01:00
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-05-05 13:23:27 -07:00
power_supply: Populate supplied_from hierarchy from the device tree
2013-04-16 18:51:16 -07:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
dump_stack: unify debug information printed by show_regs()
2013-04-30 17:04:02 -07:00
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
2013-05-01 17:29:47 -04:00
proc: Split the namespace stuff out into linux/proc_ns.h
2013-05-01 17:29:39 -04:00
create_proc_cpu_mask() doesn't need an argument...
2013-04-09 14:13:35 -04:00
pstore/ram: Allow specifying ecc parameters in platform data
2013-04-03 21:50:00 -07:00
mm/shmem.c: remove an ifdef
2013-04-29 15:54:28 -07:00
Merge commit ' 8700c95adb' into timers/nohz
2013-05-02 17:54:19 +02:00
regmap: core: Provide regmap_can_raw_write() operation
2013-03-27 13:03:39 +00:00
kernel/relay.c: move FIX_SIZE macro into relay.c
2013-04-30 17:04:09 -07:00
Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-04-29 19:14:20 -07:00
reset: Add reset controller API
2013-04-12 10:26:23 +02:00
reset: Add reset controller API
2013-04-12 10:26:23 +02:00
tracing/ring-buffer: Move poll wake ups into ring buffer code
2013-03-15 00:34:50 -04:00
drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register()
2013-04-29 18:28:22 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-05-02 19:40:34 -07:00
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-05-05 13:23:27 -07:00
net: sctp: introduce uapi header for sctp
2013-04-09 13:19:39 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2013-04-30 16:27:51 -07:00
new helper: single_open_size()
2013-04-09 14:13:29 -04:00
tty: serial/samsung: make register definitions global
2013-04-11 13:14:36 -07:00
sh_eth: add R-Car support for real
2013-03-29 15:31:30 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
net: add function to allocate sk_buff head without data area
2013-04-19 14:57:57 -04:00
kernel/smp.c: remove 'priv' of call_single_data
2013-04-30 17:04:03 -07:00
sock_diag: allow to dump bpf filters
2013-04-29 13:21:30 -04:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
SSBI: Remove MSM_ prefix from SSBI drivers
2013-03-25 10:39:40 -07:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
x86, kdump: Set crashkernel_low automatically
2013-04-17 12:35:32 -07:00
tcp: implement RFC5682 F-RTO
2013-03-21 11:47:51 -04:00
ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>
2013-03-29 18:10:22 -06:00
thermal: shorten too long mcast group name
2013-03-20 17:56:58 -04:00
nohz: Re-evaluate the tick for the new task after a context switch
2013-04-22 20:29:07 +02:00
timekeeping: Add CLOCK_TAI clockid
2013-03-22 16:19:59 -07:00
timekeeping: Store cycle_last value in timekeeper struct as well
2013-04-04 13:18:31 -07:00
hwrng: timeriomem - update to support more than one device
2013-04-25 21:01:45 +08:00
ntp: Move do_adjtimex() and hardpps() functions to timekeeping.c
2013-04-04 13:18:14 -07:00
tracing: Add "uptime" trace clock that uses jiffies
2013-03-15 00:36:09 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
tty: Fix checkpatch errors in tty_ldisc.h
2013-03-18 16:14:55 -07:00
mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
2013-04-19 00:40:07 +02:00
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
udp: add encap_destroy callback
2013-03-20 12:10:38 -04:00
uretprobes: Limit the depth of return probe nestedness
2013-04-13 15:31:58 +02:00
USB: remove CONFIG_USB_SUSPEND option
2013-03-28 11:10:22 -07:00
userns: Restrict when proc and sysfs can be mounted
2013-03-27 07:50:08 -07:00
arm: vexpress: Decouple vexpress-poweroff implementation from machine_desc
2013-03-21 15:17:40 +00:00
Lots of virtio work which wasn't quite ready for last merge window. Plus
2013-05-02 14:14:04 -07:00
caif_virtio: Introduce caif over virtio
2013-03-20 14:06:06 +10:30
virtio_ring: expose virtio barriers for use in vringh.
2013-03-20 14:00:41 +10:30
kexec, vmalloc: export additional vmalloc layer information
2013-04-29 15:54:34 -07:00
memcg: add memory.pressure_level events
2013-04-29 15:54:38 -07:00
mm: remove CONFIG_HOTPLUG ifdefs
2013-04-29 15:54:37 -07:00
virtio: Introduce vringh wrappers in virtio_config
2013-03-20 14:06:05 +10:30
workqueue: include workqueue info when printing debug dump of a worker task
2013-04-30 17:04:02 -07:00
