summaryrefslogtreecommitdiffstats
path: root/etc/examples
diff options
context:
space:
mode:
Diffstat (limited to 'etc/examples')
-rw-r--r--etc/examples/189-merge-conflict.1.diff38
-rw-r--r--etc/examples/189-merge-conflict.2.diff100
-rw-r--r--etc/examples/189-merge-conflict.3.diff41
-rw-r--r--etc/examples/189-merge-conflict.4.diff16
-rw-r--r--etc/examples/189-merge-conflict.5.diff17
-rw-r--r--etc/examples/308-side-by-side-tabs.diff12
-rwxr-xr-xetc/examples/662-submodules45
-rw-r--r--etc/examples/72-color-moved-2.diff8
-rw-r--r--etc/examples/72-color-moved-3.diff14
-rw-r--r--etc/examples/72-color-moved-4.diff8
-rw-r--r--etc/examples/802-color-moved.diff12
-rw-r--r--etc/examples/813-cthulhu.diff1495
-rw-r--r--etc/examples/822-hunk-header-within-merge-conflict.diff545
-rw-r--r--etc/examples/styles.py4
14 files changed, 0 insertions, 2355 deletions
diff --git a/etc/examples/189-merge-conflict.1.diff b/etc/examples/189-merge-conflict.1.diff
deleted file mode 100644
index b9751de3..00000000
--- a/etc/examples/189-merge-conflict.1.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --cc src/handlers/merge_conflict.rs
-index 8fc4116b,eb115dde..00000000
---- a/src/handlers/merge_conflict.rs
-+++ b/src/handlers/merge_conflict.rs
-@@@ -88,8 -88,10 +88,20 @@@ fn paint_buffered_merge_conflict_lines
- .map(|s| (s.to_string(), State::HunkMinus(None, None)))
- .collect();
- for plus_lines in &[&lines[Ours], &lines[Theirs]] {
-++<<<<<<< HEAD
- + let plus_lines = plus_lines.iter().collect();
- + let a = 1;
-++||||||| cf306705
-++ let plus_lines = plus_lines
-++ .iter()
-++ .map(|s| (s.to_string(), State::HunkMinus(None, None)))
-++ .collect();
-++=======
-+ let plus_lines = plus_lines
-+ .iter()
-+ .map(|s| (s.to_string(), State::HunkMinus(None, Some(7))))
-+ .collect();
-++>>>>>>> z-189-combined-diff-and-conflicts-merge-conflict-branch-2
- paint::paint_minus_and_plus_lines(
- MinusPlus::new(&minus_lines, &plus_lines),
- line_numbers_data,
-@@@ -97,7 -99,7 +109,12 @@@
- output_buffer,
- config,
- );
-++<<<<<<< HEAD
- + let b = 2;
-++||||||| cf306705
-++=======
-+ let b = 9;
-++>>>>>>> z-189-combined-diff-and-conflicts-merge-conflict-branch-2
- output_buffer.push_str("\n\n");
- }
- Ok(())
diff --git a/etc/examples/189-merge-conflict.2.diff b/etc/examples/189-merge-conflict.2.diff
deleted file mode 100644
index 6a846a6f..00000000
--- a/etc/examples/189-merge-conflict.2.diff
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --cc src/paint.rs
-index 79b44db1,0f429d5c..00000000
---- a/src/paint.rs
-+++ b/src/paint.rs
-@@@ -387,30 -457,36 +387,88 @@@ impl<'p> Painter<'p> 
- ) -> (Option<BgFillMethod>, Style) {
- // style: for right fill if line contains no emph sections
- // non_emph_style: for right fill if line contains emph sections
-++<<<<<<< HEAD
- + let (style, non_emph_style) = match state {
- + State::HunkMinus(None) | State::HunkMinusWrapped => {
- + (config.minus_style, config.minus_non_emph_style)
- + }
- + State::HunkZero | State::HunkZeroWrapped => (config.zero_style, config.zero_style),
- + State::HunkPlus(None) | State::HunkPlusWrapped => {
- + (config.plus_style, config.plus_non_emph_style)
- + }
- + State::HunkMinus(Some(_)) | State::HunkPlus(Some(_)) => {
- + let style = if !diff_sections.is_empty() {
- + diff_sections[diff_sections.len() - 1].0
-++||||||| parent of 4d4b19ca (Always use non-emph style for right fill)
-++ let (style, non_emph_style) = match state {
-++ State::HunkMinus(None) | State::HunkMinusWrapped => {
-++ (config.minus_style, config.minus_non_emph_style)
-++ }
-++ State::HunkMinus(Some(raw_line)) => {
-++ // TODO: This is the second time we are parsing the ANSI sequences
-++ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
-++ let style = Style {
-++ ansi_term_style,
-++ ..Style::new()
-++ };
-++ (style, style)
-++ } else {
-++ (config.minus_style, config.minus_non_emph_style)
-++ }
-++ }
-++ State::HunkZero | State::HunkZeroWrapped => (config.zero_style, config.zero_style),
-++ State::HunkPlus(None) | State::HunkPlusWrapped => {
-++ (config.plus_style, config.plus_non_emph_style)
-++ }
-++ State::HunkPlus(Some(raw_line)) => {
-++ // TODO: This is the second time we are parsing the ANSI sequences
-++ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
-++ let style = Style {
-++ ansi_term_style,
-++ ..Style::new()
-++ };
-++ (style, style)
-++=======
-+ let non_emph_style = match state {
-+ State::HunkMinus(None) | State::HunkMinusWrapped => config.minus_non_emph_style,
-+ State::HunkMinus(Some(raw_line)) => {
-+ // TODO: This is the second time we are parsing the ANSI sequences
-+ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
-+ Style {
-+ ansi_term_style,
-+ ..Style::new()
-+ }
-+ } else {
-+ config.minus_non_emph_style
-+ }
-+ }
-+ State::HunkZero | State::HunkZeroWrapped => config.zero_style,
-+ State::HunkPlus(None) | State::HunkPlusWrapped => config.plus_non_emph_style,
-+ State::HunkPlus(Some(raw_line)) => {
-+ // TODO: This is the second time we are parsing the ANSI sequences
-+ if let Some(ansi_term_style) = ansi::parse_first_style(raw_line) {
-+ Style {
-+ ansi_term_style,
-+ ..Style::new()
-+ }
-++>>>>>>> 4d4b19ca (Always use non-emph style for right fill)
- } else {
-++<<<<<<< HEAD
- + config.null_style
- + };
- + (style, style)
-++||||||| parent of 4d4b19ca (Always use non-emph style for right fill)
-++ (config.plus_style, config.plus_non_emph_style)
-++ }
-++=======
-+ config.plus_non_emph_style
-+ }
-++>>>>>>> 4d4b19ca (Always use non-emph style for right fill)
- }
-- State::Blame(_, _) => (diff_sections[0].0, diff_sections[0].0),
-- _ => (config.null_style, config.null_style),
-- };
-- let fill_style = if style_sections_contain_more_than_one_style(diff_sections) {
-- non_emph_style // line contains an emph section
-- } else {
-- style
-+ State::Blame(_, _) => diff_sections[0].0,
-+ _ => config.null_style,
- };
-+ let fill_style = non_emph_style;
- 
- match (
- fill_style.get_background_color().is_some(),
diff --git a/etc/examples/189-merge-conflict.3.diff b/etc/examples/189-merge-conflict.3.diff
deleted file mode 100644
index a9600510..00000000
--- a/etc/examples/189-merge-conflict.3.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --cc Makefile
-index 759070d,3daf9eb..0000000
---- a/Makefile
-+++ b/Makefile
-@@@ -4,13 -4,16 +4,37 @@@ build
- lint:
- cargo clippy
-
-++<<<<<<< Updated upstream
- +test: unit-test end-to-end-test
- +
- +unit-test:
- + cargo test
- +
- +end-to-end-test: build
- + bash -c "diff -u <(git log -p) <(git log -p | target/release/delta --color-only | perl -pe 's/\e\[[0-9;]*m//g')"
-++||||||| constructed merge base
-++test:
-++ cargo test
-++ bash -c "diff -u <(git log -p) \
-++ <(git log -p | delta --width variable \
-++ --tabs 0 \
-++ --retain-plus-minus-markers \
-++ --commit-style plain \
-++ --file-style plain \
-++ --hunk-style plain \
-++ | ansifilter)" ++=======
-+ test:
-+ cargo test --release
-+ bash -c "diff -u <(git log -p) \
-+ <(git log -p | target/release/delta --width variable \
-+ --tabs 0 \
-+ --retain-plus-minus-markers \
-+ --commit-style plain \
-+ --file-style plain \
-+ --hunk-style plain \
-+ | ansifilter)"> /dev/null
-++>>>>>>> Stashed changes
-
- release:
- @make -f release.Makefile release
diff --git a/etc/examples/189-merge-conflict.4.diff b/etc/examples/189-merge-conflict.4.diff
deleted file mode 100644
index d88ea2e2..00000000
--- a/etc/examples/189-merge-conflict.4.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --cc src/handlers/merge_conflict.rs
-index 888eee8b,7ea2e9d3..00000000
---- a/src/handlers/merge_conflict.rs
-+++ b/src/handlers/merge_conflict.rs
-@@@ -5,7 -5,7 +5,11 @@@ use crate::utils::process
- impl<'a> StateMachine<'a> {
- pub fn handle_merge_confict_line(&mut self) -> std::io::Result<bool> {
- self.painter.emit()?;
-++<<<<<<< HEAD
- + // hello
-++=======
-+ // bye
-++>>>>>>> b
- let mut handled_line = false;
- if matches!(self.state, State::Unknown) {
- if let Some(process::CallingProcess::GitShow(_, extension)) =
diff --git a/etc/examples/189-merge-conflict.5.diff b/etc/examples/189-merge-conflict.5.diff
deleted file mode 100644
index 8e9ddab9..00000000
--- a/etc/examples/189-merge-conflict.5.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --cc src/handlers/merge_conflict.rs
-index 888eee8b,7ea2e9d3..00000000
---- a/src/handlers/merge_conflict.rs
-+++ b/src/handlers/merge_conflict.rs
-@@@ -5,7 -5,7 +5,12 @@@ use crate::utils::process
- impl<'a> StateMachine<'a> {
- pub fn handle_merge_confict_line(&mut self) -> std::io::Result<bool> {
- self.painter.emit()?;
-++<<<<<<< HEAD
- + // hello
-++||||||| e641341d
-++=======
-+ // bye
-++>>>>>>> b
- let mut handled_line = false;
- if matches!(self.state, State::Unknown) {
- if let Some(process::CallingProcess::GitShow(_, extension)) =
diff --git a/etc/examples/308-side-by-side-tabs.diff b/etc/examples/308-side-by-side-tabs.diff
deleted file mode 100644
index 5abb52ae..00000000
--- a/etc/examples/308-side-by-side-tabs.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git .config/git/config .config/git/config
-index bc4ae2e..b058f99 100644
---- .config/git/config
-+++ .config/git/config
-@@ -26,7 +21,6 @@
- # Show summary of changes to submodules. See also:
- # https://git-scm.com/book/en/v2/Git-Tools-Submodules
- submoduleSummary = true
-- showStash = true
-
- [diff]
- tool = vimdiff
diff --git a/etc/examples/662-submodules b/etc/examples/662-submodules
deleted file mode 100755
index 1f4a5189..00000000
--- a/etc/examples/662-submodules
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-REPO_ROOT=/tmp/submodule-diff-example
-REPO_DATE_FMT=%H:%M:%S.%N
-mkdir ${REPO_ROOT} && git -C ${REPO_ROOT} init && cd ${REPO_ROOT}
-date +${REPO_DATE_FMT} >> baserepo && git add baserepo && git commit -m "Base repo commit 1"
-
-for sub in A B C; do
- git init submodule${sub}
- for iter in $(seq 1 4); do
- date +${REPO_DATE_FMT} >> submodule${sub}/subcontent
- git -C submodule${sub} add subcontent && git -C submodule${sub} commit -m "Submodule ${sub} initial commit $iter"
- done
- # Add initial submodule, message of "Submodule submoduleX 0000000...xxxxxxx (new submodule)", no individual commits
- git submodule add ../bogus-url-${sub} submodule${sub} && \
- git commit -m "Add submodule${sub}" # the diff handling for this is correct in delta
-
- # Create additional submodule commits
- for iter in $(seq 1 2); do
- date +${REPO_DATE_FMT} >> submodule${sub}/subcontent
- git -C submodule${sub} add subcontent && git -C submodule${sub} commit -m "Submodule ${sub} extra change ${iter}"
- done
- git add submodule${sub} && git commit -m "Update submodule${sub}"
-done
-
-git -C submoduleA reset --hard HEAD~4
-git -C submoduleC reset --hard HEAD~2
-
-for sub in B C; do
- for iter in $(seq 1 3); do
- date +${REPO_DATE_FMT} >> submodule${sub}/subcontent
- git -C submodule${sub} add subcontent && git -C submodule${sub} commit -m "Submodule ${sub} stage change ${iter}"
- done
-done
-
-# Add all submodule updates in single commit to test multiple submodule updates in single commit
-git add submodule[A-C] && git commit -m "Update all submodules"
-
-# submoduleA end state is only removed commits
-# submoduleB end state is only added commits
-# submoduleC is a mixture of removed and added commits (e.g. different branch)
-
-# Manual, inspect superproject history via:
-# "git -c diff.submodule=short log -p | delta --no-gitconfig"
-# "git -c diff.submodule=log log -p | delta --no-gitconfig"
-# "git -c diff.submodule=diff log -p | delta --no-gitconfig"
diff --git a/etc/examples/72-color-moved-2.diff b/etc/examples/72-color-moved-2.diff
deleted file mode 100644
index 69ddc5c8..00000000
--- a/etc/examples/72-color-moved-2.diff
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/file.py b/file.py
-index f07db74..3cb162d 100644
---- a/file.py
-+++ b/file.py
-@@ -1,2 +1,2 @@
--class X: pass
- class Y: pass
-+class X: pass
diff --git a/etc/examples/72-color-moved-3.diff b/etc/examples/72-color-moved-3.diff
deleted file mode 100644
index a24d447a..00000000
--- a/etc/examples/72-color-moved-3.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-commit fffb6bf94087c432b6e2e29cab97bf1f8987c641
-Author: Dan Davison <dandavison7@gmail.com>
-Date: Tue Nov 23 14:51:46 2021 -0500
-
- DEBUG
-
-diff --git a/src/config.rs b/src/config.rs
-index efe6adb..9762222 100644
---- a/src/config.rs
-+++ b/src/config.rs
-@@ -400,6 +400,7 @@ fn make_blame_palette(blame_palette: Option<String>, is_light_mode: bool) -> Vec
-+pub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {
-@@ -416,29 +433,30 @@ fn make_styles_map(opt: &cli::Opt) -> Option<HashMap<style::AnsiTermStyleEqualit
--pub fn user_supplied_option(option: &str, arg_matches: &clap::ArgMatches) -> bool {
diff --git a/etc/examples/72-color-moved-4.diff b/etc/examples/72-color-moved-4.diff
deleted file mode 100644
index 9aa6fc6e..00000000
--- a/etc/examples/72-color-moved-4.diff
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/file.py b/file.py
-index f2f1f5e..9735c3a 100644
---- a/file.py
-+++ b/file.py
-@@ -1,2 +1,2 @@
--class X: pass # • unicode
- class Y: pass # • unicode
-+class X: pass # • unicode
diff --git a/etc/examples/802-color-moved.diff b/etc/examples/802-color-moved.diff
deleted file mode 100644
index 40cf9c32..00000000
--- a/etc/examples/802-color-moved.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-commit 57e5082
-Author: Caleb Maclennan <caleb@alerque.com>
-Date: Sat Nov 27 01:08:54 2021 +0300
-
- Move verses to correct week file
-
-diff --git a/foo.md b/foo.md
-index ba489f0..0ad8245 100644
---- a/foo.md
-+++ b/foo.md
-@@ -20,3 +20,99 @@ foo bar
-+As I swore in my wrath, 'They shall not enter my rest.'"
diff --git a/etc/examples/813-cthulhu.diff b/etc/examples/813-cthulhu.diff
deleted file mode 100644
index 36ee11a4..00000000
--- a/etc/examples/813-cthulhu.diff
+++ /dev/null
@@ -1,1495 +0,0 @@
-commit 2cde51fbd0f310c8a2c5f977e665c0ac3945b46d
-Merge: 7471c5c9f58e c097d5fdf3b5 74c375cb85d7 04c3a852f51f 5095f55d7cc3 4f534777c130 2f54d2a1cf7e 56d37d85438d 192043cf6089 f467a0f513ad bbe580302d33 3990c516de66 d754fa9ad18d 516ea4b58433 69ae8489076f 25c1a63f43ca f52c91921553 111bd7b18e13 aafa85e71a75 dd407a324323 71467e46414d 0f7f3d1f17c2 8778ac6be25a 0406a40a095c 308a0f3f24db 2650bc4f6d0c 8cb7a36eb3a8 323702b4e06d ef749400434c 3cec159cfb3f 72aa62bed3ea 328089a47112 11db0da831b1 e1771bcf99b0 f60e5473e678 a010ff628c09 5e8154332f48 58381da68774 626bcacb89f9 38136bde7691 06b2bd23057f 8c5178fca4ce 8e6ad35a31e7 008ef947d0c5 f58c4fc4a3bf 2309d6757900 5c1537163ce7 b65ab73e5d62 26090a834b49 9ea6fbc66d15 2c4864334c4d 1769267bb013 f3f9a60f7947 f25cf3496982 3f3002692ce8 fbbf7fea8e80 c3e8494c001c e40e0b5da87b 50c969732043 63587116811b 0112b62b12e1 a0a05916cf67 b888edbc68fb d44008b35858 9a199b8e9933 784cbf8ab464
-Author: Mark Brown <broonie@linaro.org>
-Date: Thu Jan 2 13:01:55 2014 +0000
-
- Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/au1x', 'asoc/topic/axi', 'asoc/topic/bcm2835', 'asoc/topic/blackfin', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/davinci', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/fsl-mxs', 'asoc/topic/generic', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/mxs', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/s6000', 'asoc/topic/sai', 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/spear', 'asoc/topic/ssm2518', 'asoc/topic/ssm2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl6040', 'asoc/topic/txx9', 'asoc/topic/uda1380', 'asoc/topic/width', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next
-
-diff --cc include/sound/soc.h
-index 1cda7d343d16,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1cda7d343d16,1f741cb24f33,1f741cb24f33,1f741cb24f33,f7e1fac51bba,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1cda7d343d16,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33,1f741cb24f33..5a049d969c59
---- a/include/sound/soc.h
-+++ b/include/sound/soc.h
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -444,17 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 -446,6 +444,17 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ int snd_soc_jack_add_gpios(struct snd_s
- ++ struct snd_soc_jack_gpio *gpios);
- ++ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
- ++ struct snd_soc_jack_gpio *gpios);
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ #else
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ struct snd_soc_jack_gpio *gpios)
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ {
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ return 0;
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ }
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ struct snd_soc_jack_gpio *gpios)
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ {
-++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++ }
- + #endif
- +
- + /* codec register bit access */
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -879,8 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,8 -879,6 -879,6 -879,6 -886,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,8 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 -879,6 +886,8 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ struct snd_soc_dai_link
- ++
- ++ /* Symmetry requirements */
- ++ unsigned int symmetric_rates:1;
-++++++++++++++++++ ++++++++++++++++ ++++++++++++++++++++++++++++ unsigned int symmetric_channels:1;
-++++++++++++++++++ ++++++++++++++++ ++++++++++++++++++++++++++++ unsigned int symmetric_samplebits:1;
- +
- + /* Do not create a PCM for this DAI link (Backend link) */
- + unsigned int no_pcm:1;
-diff --cc sound/soc/Kconfig
-index 5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,866dfec4b6b5,a5e3a70c0d3d,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,5138b8493051,463a9e25e04f..d62ce483a443
---- a/sound/soc/Kconfig
-+++ b/sound/soc/Kconfig
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,9 -31,9 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 -31,8 +31,10 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ config SND_SOC_GENERIC_DMAENGINE_PC
- ++ select SND_DMAENGINE_PCM
- ++
- ++ # All the supported SoCs
-++++++++++ +++++++++++++++++++++++++++++++++++++++++++++++++++++ source "sound/soc/adi/Kconfig"
- + source "sound/soc/atmel/Kconfig"
- + source "sound/soc/au1x/Kconfig"
-+++++++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++ source "sound/soc/bcm/Kconfig"
- + source "sound/soc/blackfin/Kconfig"
- + source "sound/soc/cirrus/Kconfig"
- + source "sound/soc/davinci/Kconfig"
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -43,7 -43,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 -42,7 +44,7 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ source "sound/soc/jz4740/Kconfig
- ++ source "sound/soc/nuc900/Kconfig"
- ++ source "sound/soc/omap/Kconfig"
- ++ source "sound/soc/kirkwood/Kconfig"
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ source "sound/soc/intel/Kconfig"
- + source "sound/soc/mxs/Kconfig"
- + source "sound/soc/pxa/Kconfig"
- + source "sound/soc/samsung/Kconfig"
-diff --cc sound/soc/Makefile
-index 8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,c70c7f76d2df,b52d4aad0716,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,8b9e70105dd2,ff291d3e60af..62a1822e77bf
---- a/sound/soc/Makefile
-+++ b/sound/soc/Makefile
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,16 -8,16 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 -8,15 +8,17 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ endi
- ++ obj-$(CONFIG_SND_SOC) += snd-soc-core.o
- ++ obj-$(CONFIG_SND_SOC) += codecs/
- ++ obj-$(CONFIG_SND_SOC) += generic/
-++++++++++ +++++++++++++++++++++++++++++++++++++++++++++++++++++ obj-$(CONFIG_SND_SOC) += adi/
- + obj-$(CONFIG_SND_SOC) += atmel/
- + obj-$(CONFIG_SND_SOC) += au1x/
-+++++++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++ obj-$(CONFIG_SND_SOC) += bcm/
- + obj-$(CONFIG_SND_SOC) += blackfin/
- + obj-$(CONFIG_SND_SOC) += cirrus/
- + obj-$(CONFIG_SND_SOC) += davinci/
- ++ obj-$(CONFIG_SND_SOC) += dwc/
- ++ obj-$(CONFIG_SND_SOC) += fsl/
- ++ obj-$(CONFIG_SND_SOC) += jz4740/
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ obj-$(CONFIG_SND_SOC) += intel/
- + obj-$(CONFIG_SND_SOC) += mxs/
- + obj-$(CONFIG_SND_SOC) += nuc900/
- + obj-$(CONFIG_SND_SOC) += omap/
-diff --cc sound/soc/atmel/sam9x5_wm8731.c
-index 7d6a9055874b,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,6f4e812d6e61,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15,992ae38d5a15..3188036a18f0
---- a/sound/soc/atmel/sam9x5_wm8731.c
-+++ b/sound/soc/atmel/sam9x5_wm8731.c
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -97,8 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 -97,6 +97,8 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ static int sam9x5_wm8731_driver_probe(s
- ++ goto out;
- ++ }
- ++
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ snd_soc_card_set_drvdata(card, priv);
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- + card->dev = &pdev->dev;
- + card->owner = THIS_MODULE;
- + card->dai_link = dai;
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -109,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 +109,7 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- ++ dai->stream_name = "WM8731 PCM";
- ++ dai->codec_dai_name = "wm8731-hifi";
- ++ dai->init = sam9x5_wm8731_init;
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ dai->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF
- + | SND_SOC_DAIFMT_CBM_CFM;
- +
- + ret = snd_soc_of_parse_card_name(card, "atmel,model");
-diff --cc sound/soc/codecs/wm5110.c
-index 0ab2dc296474,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,f3d96eae031a,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,bbd64384ca1c,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,c3c7396a6181,