Merge pull request #104 from torvalds/master

Sync up with Linus
dabrace · Sep 10, 2015 · e6fd056 · e6fd056
2 parents be8fc7f + b8889c4
commit e6fd056
Show file tree

Hide file tree

Showing 275 changed files with 65,877 additions and 3,293 deletions.
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
@@ -490,4 +490,31 @@ X!Ilib/fonts/fonts.c
 !Edrivers/hsi/hsi.c
  </chapter>
 
+ <chapter id="pwm">
+ <title>Pulse-Width Modulation (PWM)</title>
+ <para>
+ Pulse-width modulation is a modulation technique primarily used to
+ control power supplied to electrical devices.
+ </para>
+ <para>
+ The PWM framework provides an abstraction for providers and consumers
+ of PWM signals. A controller that provides one or more PWM signals is
+ registered as <structname>struct pwm_chip</structname>. Providers are
+ expected to embed this structure in a driver-specific structure. This
+ structure contains fields that describe a particular chip.
+ </para>
+ <para>
+ A chip exposes one or more PWM signal sources, each of which exposed
+ as a <structname>struct pwm_device</structname>. Operations can be
+ performed on PWM devices to control the period, duty cycle, polarity
+ and active state of the signal.
+ </para>
+ <para>
+ Note that PWM devices are exclusive resources: they can always only be
+ used by one consumer at a time.
+ </para>
+!Iinclude/linux/pwm.h
+!Edrivers/pwm/core.c
+ </chapter>
+
 </book>
diff --git a/Documentation/devicetree/bindings/pwm/lpc1850-sct-pwm.txt b/Documentation/devicetree/bindings/pwm/lpc1850-sct-pwm.txt
@@ -0,0 +1,20 @@
+* NXP LPC18xx State Configurable Timer - Pulse Width Modulator driver
+
+Required properties:
+ - compatible: Should be "nxp,lpc1850-sct-pwm"
+ - reg: Should contain physical base address and length of pwm registers.
+ - clocks: Must contain an entry for each entry in clock-names.
+ See ../clock/clock-bindings.txt for details.
+ - clock-names: Must include the following entries.
+ - pwm: PWM operating clock.
+ - #pwm-cells: Should be 3. See pwm.txt in this directory for the description
+ of the cells format.
+
+Example:
+ pwm: pwm@40000000 {
+ compatible = "nxp,lpc1850-sct-pwm";
+ reg = <0x40000000 0x1000>;
+ clocks =<&ccu1 CLK_CPU_SCT>;
+ clock-names = "pwm";
+ #pwm-cells = <3>;
+ };
diff --git a/Documentation/features/vm/THP/arch-support.txt b/Documentation/features/vm/THP/arch-support.txt
@@ -20,7 +20,7 @@
  | ia64: | TODO |
  | m32r: | .. |
  | m68k: | .. |
- | metag: |  ..  |
+ | metag: | TODO |
  | microblaze: | .. |
  | mips: | ok |
  | mn10300: | .. |

diff --git a/Documentation/infiniband/sysfs.txt b/Documentation/infiniband/sysfs.txt
@@ -64,3 +64,23 @@ MTHCA
  fw_ver - Firmware version
  hca_type - HCA type: "MT23108", "MT25208 (MT23108 compat mode)",
  or "MT25208"
+
+HFI1
+
+ The hfi1 driver also creates these additional files:
+
+ hw_rev - hardware revision
+ board_id - manufacturing board id
+ tempsense - thermal sense information
+ serial - board serial number
+ nfreectxts - number of free user contexts
+ nctxts - number of allowed contexts (PSM2)
+ chip_reset - diagnostic (root only)
+ boardversion - board version
+ ports/1/
+ CMgtA/
+ cc_settings_bin - CCA tables used by PSM2
+ cc_table_bin
+ sc2v/ - 32 files (0 - 31) used to translate sl->vl
+ sl2sc/ - 32 files (0 - 31) used to translate sl->sc
+ vl2mtu/ - 16 (0 - 15) files used to determine MTU for vl
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -5341,6 +5341,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
 S: Supported
 F: Documentation/infiniband/
 F: drivers/infiniband/
+F: drivers/staging/rdma/
 F: include/uapi/linux/if_infiniband.h
 F: include/uapi/rdma/
 F: include/rdma/
@@ -5598,7 +5599,7 @@ IPATH DRIVER
 M: Mike Marciniszyn <infinipath@intel.com>
 L: linux-rdma@vger.kernel.org
 S: Maintained
-F: drivers/infiniband/hw/ipath/
+F: drivers/staging/rdma/ipath/
 
 IPMI SUBSYSTEM
 M: Corey Minyard <minyard@acm.org>
@@ -7376,7 +7377,7 @@ F: drivers/scsi/nsp32*
 NIOS2 ARCHITECTURE
 M: Ley Foon Tan <lftan@altera.com>
 L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
-T: git git://git.rocketboards.org/linux-socfpga-next.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 S: Maintained
 F: arch/nios2/
 
@@ -9976,6 +9977,12 @@ M: Arnaud Patard <arnaud.patard@rtp-net.org>
 S: Odd Fixes
 F: drivers/staging/xgifb/
 
+HFI1 DRIVER
+M: Mike Marciniszyn <infinipath@intel.com>
+L: linux-rdma@vger.kernel.org
+S: Supported
+F: drivers/staging/rdma/hfi1
+
 STARFIRE/DURALAN NETWORK DRIVER
 M: Ion Badulescu <ionut@badula.org>
 S: Odd Fixes

diff --git a/arch/metag/kernel/irq.c b/arch/metag/kernel/irq.c
@@ -270,23 +270,25 @@ void migrate_irqs(void)
 
  for_each_active_irq(i) {
  struct irq_data *data = irq_get_irq_data(i);
+ struct cpumask *mask;
  unsigned int newcpu;
 
  if (irqd_is_per_cpu(data))
  continue;
 
- if (!cpumask_test_cpu(cpu, data->affinity))
+ mask = irq_data_get_affinity_mask(data);
+ if (!cpumask_test_cpu(cpu, mask))
  continue;
 
- newcpu = cpumask_any_and(data->affinity, cpu_online_mask);
+ newcpu = cpumask_any_and(mask, cpu_online_mask);
 
  if (newcpu >= nr_cpu_ids) {
  pr_info_ratelimited("IRQ%u no longer affine to CPU%u\n",
  i, cpu);
 
- cpumask_setall(data->affinity);
+ cpumask_setall(mask);
  }
- irq_set_affinity(i, data->affinity);
+ irq_set_affinity(i, mask);
  }
 }
 #endif /* CONFIG_HOTPLUG_CPU */