David S. Miller
0fa74a4be4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/emulex/benet/be_main.c
net/core/sysctl_net_core.c
net/ipv4/inet_diag.c
The be_main.c conflict resolution was really tricky. The conflict
hunks generated by GIT were very unhelpful, to say the least. It
split functions in half and moved them around, when the real actual
conflict only existed solely inside of one function, that being
be_map_pci_bars().
So instead, to resolve this, I checked out be_main.c from the top
of net-next, then I applied the be_main.c changes from 'net' since
the last time I merged. And this worked beautifully.
The inet_diag.c and sysctl_net_core.c conflicts were simple
overlapping changes, and were easily to resolve.
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-20 18:51:09 -04:00
ARM: 8256/1: driver coamba: add device binding path 'driver_override'
2015-02-10 10:23:15 +00:00
bcma: move internal function declarations to private header
2015-03-05 14:11:43 +02:00
libceph: tcp_nodelay support
2015-02-19 13:31:40 +03:00
clk: omap: compile legacy omap3 clocks conditionally
2015-02-03 11:06:11 -08:00
fsl /bestcomm
gpio: Make the vararg hacks not pass magic values
2015-01-15 17:23:22 +01:00
iio: core: Introduce IIO_CHAN_INFO_DEBOUNCE_COUNT and _TIME
2015-01-29 18:49:57 +00:00
Input: MT - add support for balanced slot assignment
2015-02-01 11:50:35 -08:00
irqchip: gicv3-its: Define macros for GITS_CTLR fields
2015-03-08 05:34:35 +00:00
Changes to existing drivers:
2015-02-18 09:05:48 -08:00
net/mlx4_core: Add basic support for QP max-rate limiting
2015-03-18 14:55:19 -04:00
MMC core:
2015-02-11 10:56:48 -08:00
MTD updates for 3.20-rc1
2015-02-18 08:01:44 -08:00
SCSI misc on 20150209
2015-02-11 10:28:45 -08:00
Revert "pinctrl: consumer: use correct retval for placeholder functions"
2015-03-05 10:08:14 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-02-21 12:59:04 -08:00
power: charger-manager: Use alarmtimer for battery monitoring in suspend.
2015-01-21 20:52:07 +01:00
Merge remote-tracking branches 'regulator/topic/max8649', 'regulator/topic/mode', 'regulator/topic/mt6397', 'regulator/topic/pfuze100' and 'regulator/topic/qcom-rpm' into regulator-next
2015-02-08 11:16:27 +08:00
rtc: add driver for DS1685 family of real time clocks
2015-02-16 17:56:05 -08:00
soc /ti
cc2520: Add support for CC2591 amplifier.
2015-03-18 17:50:25 +01:00
bcma: detect SPROM revision 11
2015-01-29 10:49:28 +02:00
Merge branch 'cleanups'
2015-02-18 07:28:37 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
ACPI: Add interfaces to parse IOAPIC ID for IOAPIC hotplug
2015-02-05 15:09:26 +01:00
ata: ahci_platform: fix owner module reference mismatch for scsi host
2015-01-28 18:45:23 -05:00
libata: s/ata_id_removeable()/ata_id_removable()/
2014-12-25 15:27:16 -05:00
ata: pata_platform: fix owner module reference mismatch for scsi host
2015-01-28 18:45:23 -05:00
Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:27:47 -08:00
Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 16:12:34 -08:00
watchdog: bcm47xx_wdt.c: add restart handler support
2015-02-17 21:33:27 +01:00
block: merge __bio_map_user_iov into bio_map_user_iov
2015-02-05 09:30:43 -07:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
ARM: 8187/1: add CONFIG_HAVE_ARCH_BITREVERSE to support rbit instruction
2014-12-22 16:43:06 +00:00
Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block
2015-02-12 14:13:23 -08:00
blk-mq: Allow requests to never expire
2015-01-08 08:59:01 -07:00
block: remove unused function blk_bio_map_sg
2015-02-11 11:24:14 -07:00
bpf: allow extended BPF programs access skb fields
2015-03-15 22:02:28 -04:00
net: phy: bcm7xxx: add alternate id for 7439
2015-03-09 23:57:54 -04:00
fs: introduce f_op->mmap_capabilities for nommu mmap support
2015-01-20 14:02:58 -07:00
cgroup: add dummy css_put() for !CONFIG_CGROUPS
2015-01-06 12:02:46 -05:00
cgroup: reorder SUBSYS(blkio) in cgroup_subsys.h
2015-01-06 12:02:46 -05:00
clk: Add __clk_hw_set_clk helper function
2015-02-18 09:40:07 -08:00
clk: introduce clk_is_match
2015-03-11 15:56:59 -07:00
time: move the timecounter/cyclecounter code into its own file.
2014-12-30 18:29:25 -05:00
mm/compaction: add tracepoint to observe behaviour of compaction defer
2015-02-11 17:06:04 -08:00
compat: Declare compat_sys_sigpending and compat_sys_sigprocmask prototypes
2015-01-27 09:37:53 +00:00
compiler: introduce __alias(symbol) shortcut
2015-02-13 21:21:40 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kernel: make READ_ONCE() valid on const arguments
2015-02-21 10:27:33 -08:00
coresight: remove the unnecessary function coresight_is_bit_set()
2015-02-04 10:42:55 -08:00
cpufreq: remove CPUFREQ_UPDATE_POLICY_CPU notifications
2015-01-23 23:06:44 +01:00
cpuidle / sleep: Use broadcast timer for states that stop local timer
2015-03-05 23:13:19 +01:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
crypto: doc - remove colons in comments
2015-01-20 14:44:19 +11:00
lib/halfmd4.c: simplify includes
2015-02-12 18:54:15 -08:00
VFS: Split DCACHE_FILE_TYPE into regular and special types
2015-02-22 11:38:38 -05:00
debugfs: Provide a file creation function that also takes an initial size
2015-02-17 12:21:51 -05:00
PM / devfreq: event: Add devfreq_event class
2015-01-30 17:56:40 +09:00
PM: Eliminate CONFIG_PM_RUNTIME
2014-12-19 22:55:06 +01:00
dm: allocate requests in target when stacking on blk-mq devices
2015-02-09 13:06:47 -05:00
device: Change dev_<level> logging functions to return void
2015-01-26 15:57:59 -08:00
Merge branch 'topic/rcar' into for-linus
2015-02-02 16:55:43 -08:00
quota: Cleanup flags definitions
2015-01-21 19:21:30 +01:00
arm64 updates for 3.20:
2015-02-11 18:03:54 -08:00
ses: Add power_status to SES device slot
2015-01-09 15:44:19 +01:00
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
exportfs: add methods for block layout exports
2015-02-05 14:35:17 +01:00
f2fs: introduce macros to convert bytes and blocks in f2fs
2015-02-11 17:04:48 -08:00
video: fbdev: Check Standard Timing against DMT
2015-01-15 13:33:41 +02:00
net: fec: add Wake-on-LAN support
2014-12-31 13:06:50 -05:00
ebpf: move read-only fields to bpf_prog and shrink bpf_prog_aux
2015-03-01 14:05:19 -05:00
File locking related fixes for v3.20 (pile #2 )
2015-02-18 10:21:47 -08:00
new fs_pin killing logics
2015-01-25 23:17:28 -05:00
fsnotify: fix handling of renames in audit
2015-02-10 14:30:28 -08:00
The updates included in this pull request for ftrace are:
2015-02-12 08:37:41 -08:00
genetlink: synchronize socket closing and family removal
2015-01-16 17:04:25 -05:00
mm/mempolicy.c: merge alloc_hugepage_vma to alloc_pages_vma
2015-02-11 17:06:04 -08:00
[media] hdmi: rename HDMI_AUDIO_CODING_TYPE_EXT_STREAM to _EXT_CT
2015-01-27 10:19:12 -02:00
HID: hid-sensor-hub: Correct documentation
2015-02-17 13:34:44 +01:00
gpu: host1x: Provide a proper struct bus_type
2015-01-27 10:09:14 +01:00
hrtimer: Prevent stale expiry time in hrtimer_interrupt()
2015-01-23 12:13:20 +01:00
mm: numa: do not trap faults on the huge zero page
2015-02-12 18:54:08 -08:00
mm/hugetlb: take page table lock in follow_huge_pmd()
2015-02-11 17:06:01 -08:00
hwrng: core - Use struct completion for cleanup_done
2014-12-26 08:33:34 +11:00
Drivers: hv: rename sc_lock to the more generic lock
2015-01-25 09:18:00 -08:00
Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2015-02-21 12:41:50 -08:00
mac80111: Add BIP-CMAC-256 cipher
2015-01-27 11:09:13 +01:00
mac802154: correct max sifs size handling
2015-03-14 17:11:30 +01:00
bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi
2015-03-05 14:52:23 -05:00
pppoe: Use workqueue to die properly when a PADT is received
2015-03-02 00:17:31 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-05 14:33:28 -08:00
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
2015-03-18 22:05:09 -04:00
inet_diag: add const to inet_diag_req_v2
2015-03-10 13:45:28 -04:00
kasan: enable stack instrumentation
2015-02-13 21:21:41 -08:00
genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
2015-03-04 21:42:19 +01:00
iopoll: Introduce memory-mapped IO polling macros
2015-01-19 16:11:59 +00:00
iommu: Make IOVA domain page size explicit
2015-01-19 14:55:22 +01:00
ipv6: pull cork initialization into its own function.
2015-02-02 19:28:04 -08:00
genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
2015-03-04 21:42:19 +01:00
jbd: drop jbd_ENOSYS debug
2015-01-15 10:34:54 +01:00
jbd: drop jbd_ENOSYS debug
2015-01-15 10:34:54 +01:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
kdb: Avoid printing KERN_ levels to consoles
2015-02-19 12:39:02 -06:00
kernel.h: remove ancient __FUNCTION__ hack
2015-02-12 18:54:13 -08:00
kernfs: remove KERNFS_STATIC_NAME
2015-02-13 21:21:36 -08:00
kexec: add IND_FLAGS macro
2015-02-17 14:34:51 -08:00
kprobes: Pass the original kprobe for preparing optimized kprobe
2015-01-13 16:10:16 +00:00
Couple of items for 3.20
2015-01-24 10:11:12 +01:00
Fairly small update, but there are some interesting new features.
2015-02-13 09:55:09 -08:00
leds: Add LED Flash class extension to the LED subsystem
2015-01-26 14:59:08 -08:00
leds: Add LED Flash class extension to the LED subsystem
2015-01-26 14:59:08 -08:00
lguest: remove NOTIFY call and eventfd facility.
2015-02-11 16:47:46 +10:30
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
memcg: reparent list_lrus and free kmemcg_id on css offline
2015-02-12 18:54:10 -08:00
list_nulls: fix missing header
2015-01-04 23:11:43 -05:00
livepatch: rename config to CONFIG_LIVEPATCH
2015-02-04 11:25:51 +01:00
dcache: let the dentry count go down to zero without taking d_lock
2015-01-25 23:16:29 -05:00
mei: bus: use ssize_t as the return type for send and receive
2015-01-12 05:04:10 -08:00
list_lru: introduce per-memcg lists
2015-02-12 18:54:09 -08:00
mm: numa: do not dereference pmd outside of the lock during NUMA hinting fault
2015-02-12 18:54:08 -08:00
mm: allow page fault handlers to perform the COW
2015-02-16 17:56:03 -08:00
mm: account pmd page tables to the process
2015-02-11 17:06:04 -08:00
mm: microoptimize zonelist operations
2015-02-11 17:06:02 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-17 17:41:19 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
2015-03-18 10:46:39 -07:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
mutex: remove unused field "name" in debug mode
2015-02-14 11:32:59 -08:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
netdev: introduce new NETIF_F_HW_SWITCH_OFFLOAD feature flag for switch device offloads
2015-02-01 23:16:33 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-20 18:51:09 -04:00
netfilter: bridge: move DNAT helper to br_netfilter
2015-03-09 17:56:07 +01:00
netlink/genetlink: pass network namespace to bind/unbind
2014-12-27 03:07:50 -05:00
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
2015-02-12 10:39:41 -08:00
NFS: Fix a regression in the read() syscall
2015-03-03 13:02:29 -05:00
nfsv3: introduce nfs3_set_ds_client
2015-02-03 11:06:34 -08:00
pnfs/flexfiles: Add the FlexFile Layout Driver
2015-02-03 11:06:52 -08:00
nfs: add mirroring support to pgio layer
2015-02-03 11:06:45 -08:00
NFSv4.1: Clean up bind_conn_to_session
2015-02-18 13:11:09 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
NVMe: Fix potential corruption during shutdown
2015-02-19 16:15:37 -07:00
gpio/gpiolib-of: Create of_mm_gpiochip_remove
2015-01-15 17:23:17 +01:00
of: mdio: export of_mdio_parse_addr
2015-03-11 17:56:28 -04:00
net: core: add of_find_net_device_by_node()
2015-03-09 23:50:20 -04:00
of/platform: Fix sparc:allmodconfig build
2015-03-13 09:45:24 -05:00
oom, PM: make OOM detection in the freezer path raceless
2015-02-11 17:06:03 -08:00
locking/mcs: Better differentiate between MCS variants
2015-01-14 15:07:32 +01:00
mm: add 'foreign' alias for the 'pinned' page flag
2015-01-28 14:03:09 +00:00
mm: page_counter: pull "-1" handling out of page_counter_memparse()
2015-02-11 17:06:02 -08:00
mm/page_owner.c: remove unnecessary stack_trace field
2015-02-11 17:06:07 -08:00
mm: get rid of radix tree gfp mask for pagecache_get_page
2014-12-29 12:45:45 -08:00
ACPI and power management updates for v3.20-rc1
2015-02-10 15:09:41 -08:00
percpu_ref: implement percpu_ref_is_dying()
2015-01-06 10:26:10 -05:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-16 14:58:12 -08:00
perf: Move task_pt_regs sampling into arch code
2015-01-09 11:12:28 +01:00
net: phy: keep track of the PHY suspend state
2015-01-27 00:16:51 -08:00
new fs_pin killing logics
2015-01-25 23:17:28 -05:00
PM: Convert dev_pm_put_subsys_data() into a void function
2015-02-03 22:59:25 +01:00
PM / Domains: Eliminate the mutex for the generic_pm_domain_data
2015-02-03 22:56:53 +01:00
PNP: Allow console to override ACPI device sleep
2015-02-02 10:11:25 -08:00
hexdump: make it return number of bytes placed in buffer
2015-02-12 18:54:15 -08:00
pstore: Add pmsg - user-space accessible pstore object
2015-01-16 16:01:10 -08:00
pstore: Add pmsg - user-space accessible pstore object
2015-01-16 16:01:10 -08:00
spi: pxa2xx: Add definition for Intel Quark DDS_RATE register
2014-12-22 20:17:23 +00:00
quota: Store maximum space limit in bytes
2015-01-30 12:51:21 +01:00
quota: Add ->quota_{enable,disable} callbacks for VFS quotas
2015-01-30 12:50:32 +01:00
lib/rbtree.c: fix typo in comment
2015-02-17 14:34:52 -08:00
rculist: Fix sparse warning
2015-01-06 11:01:13 -08:00
Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD
2015-01-15 23:34:34 -08:00
Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD
2015-01-15 23:34:34 -08:00
Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD
2015-01-15 23:34:34 -08:00
regmap: correct the description of structure element in reg_field
2015-01-27 13:13:04 +00:00
resources: Move struct resource_list_entry from ACPI into resource core
2015-02-05 15:09:25 +01:00
rhashtable: Fix undeclared EEXIST build error on ia64
2015-03-20 18:18:45 -04:00
vfs: remove get_xip_mem
2015-02-16 17:56:03 -08:00
rtc: Convert rtc_set_ntp_time() to use timespec64
2015-01-23 17:21:57 -08:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-21 10:40:02 -08:00
Add security hooks to binder and implement the hooks for SELinux.
2015-01-25 09:17:57 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
serial: 8250: Use canary to restart console after suspend
2015-02-02 10:11:27 -08:00
serial: uapi: Declare all userspace-visible io types
2015-03-07 03:39:55 +01:00
serial: s3c: add missing register definitions
2015-01-09 14:25:39 -08:00
vmscan: per memory cgroup slab shrinkers
2015-02-12 18:54:09 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-20 18:51:09 -04:00
mm: slub: add kernel address sanitizer support for slub allocator
2015-02-13 21:21:41 -08:00
slab: embed memcg_cache_params to kmem_cache
2015-02-12 18:54:09 -08:00
mm: slub: share object_err function
2015-02-13 21:21:41 -08:00
init: Get rid of x86isms
2015-01-22 15:10:56 +01:00
net: add real socket cookies
2015-03-11 21:55:28 -04:00
mpls: Basic routing support
2015-03-04 00:26:06 -05:00
spinlock: Add spin_lock_bh_nested()
2015-01-03 14:32:57 -05:00
spinlock: Add spin_lock_bh_nested()
2015-01-03 14:32:57 -05:00
spinlock: Add spin_lock_bh_nested()
2015-01-03 14:32:57 -05:00
rcu: Combine DEFINE_SRCU() and DEFINE_STATIC_SRCU()
2015-01-06 11:04:27 -08:00
mm/util: add kstrdup_const
2015-02-13 21:21:35 -08:00
libstring_helpers.c:string_get_size(): return void
2015-02-12 18:54:13 -08:00
PM / sleep: Re-implement suspend-to-idle handling
2015-02-13 23:49:36 +01:00
swap: remove unused mem_cgroup_uncharge_swapcache declaration
2015-02-11 17:06:00 -08:00
mm: remove remaining references to NUMA hinting bits and helpers
2015-02-12 18:54:08 -08:00
syscalls: Declare sys_*stat64 prototypes if __ARCH_WANT_(COMPAT_)STAT64
2015-01-27 09:38:00 +00:00
tcp: rename struct tcp_request_sock listener
2015-03-17 22:01:56 -04:00
thermal: Introduce dummy functions when thermal is not defined
2015-02-24 14:40:42 -04:00
ti-st: clean up data types (fix harmless memory corruption)
2015-02-03 15:48:51 -08:00
PM / sleep: Make it possible to quiesce timers during suspend-to-idle
2015-02-15 19:40:09 +01:00
Merge branch 'fortglx/3.19-stable/time' of https://git.linaro.org/people/john.stultz/linux into timers/urgent
2015-01-22 12:28:02 +01:00
timecounter: provide a macro to initialize the cyclecounter mask field.
2015-01-02 16:47:35 -05:00
time: Expose get_monotonic_boottime64 for in-kernel use
2015-01-23 17:21:55 -08:00
tracing: Add condition check to RCU lockdep checks
2015-02-07 19:34:25 -05:00
tty: Remove external interface for tty_set_termios()
2015-02-02 10:11:28 -08:00
linux/types.h: Always use unsigned long for pgoff_t
2015-02-12 18:54:13 -08:00
netns: constify net_hash_mix() and various callers
2015-03-18 22:00:34 -04:00
new helper: dup_iter()
2015-02-17 22:21:11 -05:00
USB: don't cancel queued resets when unbinding drivers
2015-01-25 20:54:17 +08:00
vfio: Add and use device request op for vfio bus drivers
2015-02-10 12:37:47 -07:00
virtio-mmio: Update the device to OASIS spec version
2015-01-23 14:57:10 +10:30
kasan, module, vmalloc: rework shadow allocation for modules
2015-03-12 18:46:08 -07:00
vmci: propagate msghdr all way down to __qp_memcpy_to_queue()
2015-02-04 01:34:14 -05:00
vt_buffer: drop console buffer copying optimisations
2015-02-02 10:09:54 -08:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE
2015-03-05 08:04:13 -05:00
mm: protect set_page_dirty() from ongoing truncation
2015-01-08 15:10:51 -08:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
