Linus Torvalds
5fa6a683c0
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"It looks like a sizeble collection but this is nearly 3 weeks of bug
fixing while you were away.
1) Fix crashes over IPSEC tunnels with NAT, the latter can reroute
the packet through a non-IPSEC protected path and the code has to
be able to handle SKBs attached to routes lacking an attached xfrm
state. From Steffen Klassert.
2) Fix OOPSs in ipv4 and ipv6 ipsec layers for unsupported
sub-protocols, also from Steffen Klassert.
3) Set local_df on fragmented netfilter skbs otherwise we won't be
able to forward successfully, from Florian Westphal.
4) cdc_mbim ipv6 neighbour code does __vlan_find_dev_deep without
holding RCU lock, from Bjorn Mork.
5) local_df test in ip_may_fragment is inverted, from Florian
Westphal.
6) jme driver doesn't check for DMA mapping failures, from Neil
Horman.
7) qlogic driver doesn't calculate number of TX queues properly, from
Shahed Shaikh.
8) fib_info_cnt can drift irreversibly positive if we fail to
allocate the fi->fib_metrics array, from Sergey Popovich.
9) Fix use after free in ip6_route_me_harder(), also from Sergey
Popovich.
10) When SYSCTL is disabled, we don't handle local_port_range and
ping_group_range defaults properly at all, from Cong Wang.
11) Unaccelerated VLAN tagged frames improperly handled by cdc_mbim
driver, fix from Bjorn Mork.
12) cassini driver needs nested lock annotations for TX locking, from
Emil Goode.
13) On init error ipv6 VTI driver can unregister pernet ops twice,
oops. Fix from Mahtias Krause.
14) If macvlan device is down, don't propagate IFF_ALLMULTI changes,
from Peter Christensen.
15) Missing NULL pointer check while parsing netlink config options in
ip6_tnl_validate(). From Susant Sahani.
16) Fix handling of neighbour entries during ipv6 router reachability
probing, from Duan Jiong.
17) x86 and s390 JIT address randomization has some address
calculation bugs leading to crashes, from Alexei Starovoitov and
Heiko Carstens.
18) Clear up those uglies with nop patching and net_get_random_once(),
from Hannes Frederic Sowa.
19) Option length miscalculated in ip6_append_data(), fix also from
Hannes Frederic Sowa.
20) A while ago we fixed a race during device unregistry when a
namespace went down, turns out there is a second place that needs
similar protection. From Cong Wang.
21) In the new Altera TSE driver multicast filtering isn't working,
disable it and just use promisc mode until the cause is found.
From Vince Bridgers.
22) When we disable router enabling in ipv6 we have to flush the
cached routes explicitly, from Duan Jiong.
23) NBMA tunnels should not cache routes on the tunnel object because
the key is variable, from Timo Teräs.
24) With stacked devices GRO information in skb->cb[] can be not setup
properly, make sure it is in all code paths. From Eric Dumazet.
25) Really fix stacked vlan locking, multiple levels of nesting with
intervening non-vlan devices are possible. From Vlad Yasevich.
26) Fallback ipip tunnel device's mtu is not setup properly, from
Steffen Klassert.
27) The packet scheduler's tcindex filter can crash because we
structure copy objects with list_head's inside, oops. From Cong
Wang.
28) Fix CHECKSUM_COMPLETE handling for ipv6 GRE tunnels, from Eric
Dumazet.
29) In some configurations 'itag' in __mkroute_input() can end up
being used uninitialized because of how fib_validate_source()
works. Fix it by explitly initializing itag to zero like all the
other fib_validate_source() callers do, from Li RongQing"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
batman: fix a bogus warning from batadv_is_on_batman_iface()
ipv4: initialise the itag variable in __mkroute_input
bonding: Send ALB learning packets using the right source
bonding: Don't assume 802.1Q when sending alb learning packets.
net: doc: Update references to skb->rxhash
stmmac: Remove unbalanced clk_disable call
ipv6: gro: fix CHECKSUM_COMPLETE support
net_sched: fix an oops in tcindex filter
can: peak_pci: prevent use after free at netdev removal
ip_tunnel: Initialize the fallback device properly
vlan: Fix build error wth vlan_get_encap_level()
can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option
MAINTAINERS: Pravin Shelar is Open vSwitch maintainer.
bnx2x: Convert return 0 to return rc
bonding: Fix alb mode to only use first level vlans.
bonding: Fix stacked device detection in arp monitoring
macvlan: Fix lockdep warnings with stacked macvlan devices
vlan: Fix lockdep warning with stacked vlan devices.
net: Allow for more then a single subclass for netif_addr_lock
net: Find the nesting level of a given device by type.
...
2014-05-23 15:29:43 -07:00
libceph: enable PRIMARY_AFFINITY feature bit
2014-04-04 21:08:20 -07:00
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
crush: add SET_CHOOSELEAF_VARY_R step
2014-04-04 21:07:28 -07:00
lib/decompress_inflate.c: include appropriate header file
2014-04-03 16:21:12 -07:00
extcon: Move OF helper function to extcon core and change function name
2014-03-19 14:41:58 +09:00
fsl /bestcomm
gpio: unmap gpio irqs properly
2014-03-28 20:42:01 +01:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-04-09 08:45:40 -07:00
Input: pmic8xxx-pwrkey - migrate to DT
2014-03-30 13:25:19 -07:00
mmc: rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"
2014-05-08 08:44:50 +01:00
net/mlx4_core: Add UPDATE_QP SRIOV wrapper support
2014-05-16 15:12:45 -04:00
IB/mlx5: Add block multicast loopback support
2014-04-10 18:43:32 -07:00
MMC highlights for 3.15:
2014-04-09 08:39:39 -07:00
Shiraz has moved
2014-04-18 16:40:08 -07:00
netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper
2014-04-08 10:56:12 +02:00
phy: core: make NULL a valid phy reference if !CONFIG_GENERIC_PHY
2014-04-24 12:53:38 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-04-10 09:06:10 -07:00
regulator: core: Return error in get optional stub
2014-04-18 15:11:54 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-04-02 16:23:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-04-12 17:31:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
PCI changes for the v3.15 merge window:
2014-04-01 15:14:04 -07:00
AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC
2014-04-10 17:51:29 -04:00
bdi: avoid oops on device removal
2014-04-03 16:20:49 -07:00
backlight: update bd state & fb_blank properties when necessary
2014-04-03 16:21:09 -07:00
exec: kill bprm->tcomm[], simplify the "basename" logic
2014-04-07 16:36:05 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
ext4: atomically set inode->i_flags in ext4_set_inode_flags()
2014-03-30 17:02:06 -07:00
block: remove old blk_iopoll_enabled variable
2014-03-13 09:38:42 -06:00
Merge branch 'for-3.15/core' of git://git.kernel.dk/linux-block
2014-04-01 19:19:15 -07:00
block: fix regression with block enabled tagging
2014-04-09 21:54:06 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
switch ->is_partially_uptodate() to saner arguments
2014-04-01 23:19:19 -04:00
cgroup: introduce task_css_is_root()
2014-05-13 11:26:27 -04:00
clk: support hardware-specific debugfs entries
2014-03-24 17:10:07 -07:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-02 12:51:41 -07:00
LLVMLinux: Add support for clang to compiler.h and new compiler-clang.h
2014-04-09 13:44:35 -07:00
LLVMLinux: Add support for clang to compiler.h and new compiler-clang.h
2014-04-09 13:44:35 -07:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
cpufreq: create another field .flags in cpufreq_frequency_table
2014-04-07 14:43:50 +02:00
mm: optimize put_mems_allowed() usage
2014-04-03 16:20:58 -07:00
cputime: Bring cputime -> nsecs conversion
2014-03-13 15:56:44 +01:00
include/linux/crash_dump.h: add vmcore_cleanup() prototype
2014-04-07 16:36:06 -07:00
kernel/groups.c: remove return value of set_groups
2014-04-03 16:21:05 -07:00
dentry_kill(): don't try to remove from shrink list
2014-05-01 10:30:00 -04:00
dm table: add dm_table_run_md_queue_async
2014-03-27 16:56:24 -04:00
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()
2014-04-16 11:56:33 -07:00
iommu/vt-d: Change scope lists to struct device, bus, devfn
2014-03-24 14:05:08 +00:00
err.h: use bool for IS_ERR and IS_ERR_OR_NULL
2014-04-03 16:21:06 -07:00
extcon: Move OF helper function to extcon core and change function name
2014-03-19 14:41:58 +09:00
get rid of files_defer_init()
2014-04-01 23:19:14 -04:00
net: filter: seccomp: fix wrong decoding of BPF_S_ANC_SECCOMP_LD_W
2014-04-14 16:26:47 -04:00
locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead
2014-04-23 16:17:03 -04:00
fanotify: convert access_mutex to spinlock
2014-04-03 16:20:51 -07:00
ftrace/module: Hardcode ftrace_module_init() call into load_module()
2014-04-28 10:37:21 -04:00
tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints
2014-04-08 20:43:28 -04:00
drm/docs: Include hdmi infoframe helper reference
2014-03-13 12:48:32 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-04-02 16:24:28 -07:00
Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for-linus
2014-04-01 19:06:50 +02:00
gpu: host1x: export host1x_syncpt_incr_max() function
2014-04-04 09:12:49 +02:00
hrtimer: Rearrange comments in the order struct members are declared
2014-03-20 12:35:45 +01:00
hugetlb: ensure hugepage access is denied if hugepages are not supported
2014-05-06 13:04:58 -07:00
Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts
2014-04-16 14:14:07 -07:00
idr: remove dead code
2014-04-07 16:36:07 -07:00
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2014-03-20 11:53:20 -04:00
macvlan: Fix lockdep warnings with stacked macvlan devices
2014-05-16 22:14:49 -04:00
vlan: Fix build error wth vlan_get_encap_level()
2014-05-20 11:24:26 -04:00
iommu/vt-d: Store PCI segment number in struct intel_iommu
2014-03-24 14:07:31 +00:00
genirq: Provide irq_force_affinity fallback for non-SMP
2014-05-07 00:42:09 +02:00
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
ipmi: Turn off all activity on an idle ipmi interface
2014-04-17 12:23:07 -07:00
ipmi: boolify some things
2014-04-17 12:30:40 -07:00
genirq: x86: Ensure that dynamic irq allocation does not conflict
2014-04-28 12:20:00 +02:00
module: remove MODULE_GENERIC_TABLE
2014-03-13 12:11:00 +10:30
net: isdn: use sk_unattached_filter api
2014-03-31 00:45:09 -04:00
Nothing major: the stricter permissions checking for sysfs broke
2014-04-06 09:38:07 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-01 11:22:57 -07:00
kernfs, sysfs, cgroup: restrict extra perm check on open to sysfs
2014-05-13 13:21:40 +02:00
kmemleak: remove redundant code
2014-04-03 16:20:50 -07:00
kobject: don't block for each kobject_uevent
2014-04-03 16:21:04 -07:00
KVM: Bump KVM_MAX_IRQ_ROUTES for s390
2014-03-21 13:43:13 +01:00
lglock: map to spinlock when !CONFIG_SMP
2014-04-07 16:36:14 -07:00
libata/ahci: accommodate tag ordered controllers
2014-04-18 15:56:03 -04:00
asmlinkage: Revert "lto: Make asmlinkage __visible"
2014-05-05 16:07:37 -07:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-03-31 14:13:25 -07:00
fs/mbcache.c: change block and index hash chain to hlist_bl_node
2014-03-18 19:19:41 -04:00
net: mdio-gpio: Add support for separate MDI and MDO gpio pins
2014-04-16 15:09:51 -04:00
ARM: 7993/1: mm/memblock: add memblock_get_current_limit
2014-03-12 00:16:56 +00:00
memcg, slab: do not destroy children caches if parent has aliases
2014-04-07 16:36:13 -07:00
mm, mempolicy: remove per-process flag
2014-04-07 16:35:54 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
nick kvfree() from apparmor
2014-05-06 14:02:53 -04:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2014-04-13 13:28:13 -07:00
mm: use 'const char *' insted of 'char *' for reason in dump_page()
2014-04-07 16:35:55 -07:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id"
2014-04-09 13:44:35 -07:00
Nothing major: the stricter permissions checking for sysfs broke
2014-04-06 09:38:07 -07:00
VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms.
2014-03-24 12:21:00 +10:30
smarter propagate_mnt()
2014-04-01 23:19:08 -04:00
switch nbd to sockfd_lookup/sockfd_put
2014-04-01 23:19:10 -04:00
net: avoid dependency of net_get_random_once on nop patching
2014-05-14 00:37:34 -04:00
net: add busy_poll device feature
2014-04-03 14:31:34 -04:00
bonding: Fix stacked device detection in arp monitoring
2014-05-16 22:29:05 -04:00
net: Add variants of capable for use on netlink messages
2014-04-24 13:44:54 -04:00
netpoll: Rename netpoll_rx_enable/disable to netpoll_poll_disable/enable
2014-03-29 17:58:37 -04:00
nfs: make nfs_async_rename non-static
2014-03-17 15:14:16 -04:00
Merge branch 'devel' into linux-next
2014-03-17 15:15:21 -04:00
nilfs2: verify metadata sizes read from disk
2014-04-03 16:21:26 -07:00
mac802154: make csma/cca parameters per-wpan
2014-04-01 16:25:51 -04:00
NTB: Code Style Clean-up
2014-04-07 10:59:19 -07:00
Merge git://git.infradead.org/users/willy/linux-nvme
2014-04-11 16:45:59 -07:00
of: fix CONFIG_OF=n prototype of of_node_full_name()
2014-05-15 15:19:12 +01:00
of/irq: do irq resolution in platform_get_irq
2014-04-24 21:40:22 +01:00
net: mdio: of_mdiobus_register(): fall back to mdiobus_register() for !CONFIG_OF
2014-05-07 17:16:35 -04:00
dmaengine: omap-dma: move register read/writes into omap-dma.c
2014-04-04 00:31:49 +01:00
mm: remove read_cache_page_async()
2014-04-03 16:21:04 -07:00
mm + fs: prepare for non-page entries in page cache radix trees
2014-04-03 16:21:00 -07:00
Merge branch 'pci/resource' into next
2014-03-19 15:11:19 -06:00
SCSI misc on 20140401
2014-04-01 18:49:04 -07:00
percpu: add preemption checks to __this_cpu ops
2014-04-07 16:36:14 -07:00
perf: Fix a race between ring_buffer_detach() and ring_buffer_attach()
2014-05-19 21:44:56 +09:00
net: phy: add minimal support for QSGMII PHY
2014-04-16 14:36:12 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
Merge branches 'pm-runtime' and 'pm-sleep'
2014-03-20 13:25:54 +01:00
include/linux/printk.h: remove double asmlinkage in printk_emit
2014-04-03 16:21:08 -07:00
net: ptp: move PTP classifier in its own file
2014-04-01 16:43:18 -04:00
ptp: introduce programmable pins.
2014-03-21 14:21:13 -04:00
ARM: pxa: fix pxa_ssp_* declarations
2014-03-21 18:26:03 +01:00
quota: provide function to grab quota structure reference
2014-04-03 16:20:54 -07:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
random: Add arch_has_random[_seed]()
2014-03-19 22:24:08 -04:00
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-03-31 11:05:24 -07:00
rcu: Provide grace-period piggybacking API
2014-03-20 17:12:25 -07:00
rcu: Provide grace-period piggybacking API
2014-03-20 17:12:25 -07:00
x86: Remove the PCI reboot method from the default chain
2014-04-16 08:56:09 +02:00
Char/Misc driver patches for 3.15-rc1
2014-04-01 16:13:21 -07:00
res_counter: remove interface for locked charging and uncharging
2014-04-07 16:35:54 -07:00
rapidio: rework device hierarchy and introduce mport class of devices
2014-04-07 16:36:07 -07:00
mm: fix swapops.h:131 bug if remap_file_pages raced migration
2014-03-20 22:09:09 -07:00
rtnetlink: wait for unregistering devices in rtnl_link_unregister()
2014-05-15 15:30:33 -04:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-05-23 10:04:04 -07:00
net: filter: rework/optimize internal BPF interpreter's instruction set
2014-03-31 00:45:09 -04:00
security: add flags to rename hooks
2014-04-01 17:08:43 +02:00
serial: s3c: Fix build of header without serial_core.h preinclusion
2014-03-21 04:12:33 +09:00
serial: sh-sci: Add more register documentation
2014-03-17 16:20:49 -07:00
Input: serio - add firmware_id sysfs attribute
2014-04-19 22:42:19 -07:00
mm + fs: prepare for non-page entries in page cache radix trees
2014-04-03 16:21:00 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2014-04-13 13:28:13 -07:00
slub: use sysfs'es release mechanism for kmem_cache
2014-05-06 13:04:59 -07:00
net: Move the permission check in sock_diag_put_filterinfo to packet_diag_dump
2014-04-24 13:44:53 -04:00
mfd: ssbi: Add regmap read/write helpers
2014-03-19 08:58:30 +00:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
net: sxgbe: add basic framework for Samsung 10Gb ethernet driver
2014-03-26 16:49:31 -04:00
This includes the final patch to clean up and fix the issue with the
2014-04-12 13:06:10 -07:00
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()
2014-04-16 11:56:33 -07:00
mm: use raw_cpu ops for determining current NUMA node
2014-04-07 16:36:13 -07:00
tracepoint: Fix sparse warnings in tracepoint.c
2014-04-09 10:12:11 -04:00
Revert "tty: Fix race condition between __tty_buffer_request_room and flush_to_ldisc"
2014-05-03 18:14:28 -04:00
net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq
2014-03-14 22:41:36 -04:00
introduce copy_page_to_iter, kill loop over iovec in generic_file_aio_read()
2014-04-01 23:19:21 -04:00
uprobes: allow ignoring of probe hits
2014-03-18 16:39:34 -04:00
USB patches for 3.15-rc1
2014-04-01 17:06:09 -07:00
drop_caches: add some documentation and info message
2014-04-03 16:21:04 -07:00
mm: per-thread vma caching
2014-04-07 16:35:53 -07:00
vmstat: use raw_cpu_ops to avoid false positives on preemption checks
2014-04-07 16:36:14 -07:00
wait: explain the shadowing and type inconsistencies
2014-04-18 16:40:08 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-01 11:00:07 -07:00
mm: remove unused arg of set_page_dirty_balance()
2014-04-07 16:35:57 -07:00
